OSDN Git Service

Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
authorPhil Weaver <pweaver@google.com>
Wed, 12 Jul 2017 23:21:55 +0000 (23:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Jul 2017 23:21:55 +0000 (23:21 +0000)
am: f75d22dcc0

Change-Id: I900c918b161f1a515850d3bbecb79092d3933b5f


Trivial merge