OSDN Git Service

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours
authorPhil Weaver <pweaver@google.com>
Wed, 12 Jul 2017 22:00:31 +0000 (22:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 22:00:31 +0000 (22:00 +0000)
commitba928bd5224f746ed7d19d1dbdd0970782d5136f
tree4f9e8fc7e56eca7207d192766853b3458d9d2a0b
parent9a4a34afd801b075228795382a63b690765ee977
parentf433884a84536386d637a1736c88518f8af78772
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours
am: f433884a84

Change-Id: I737838098a36efafe1509c4814ac1120a3bb8297