OSDN Git Service

Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c...
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 22:26:36 +0000 (22:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:26:36 +0000 (22:26 +0000)
am: 713a5420dd

Change-Id: Ib3e9b5d8c8807a5e7f41f94d127008fc4f255f3e


Trivial merge