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)
am: f433884a84

Change-Id: I737838098a36efafe1509c4814ac1120a3bb8297


Trivial merge