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:35:06 +0000 (22:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:35:06 +0000 (22:35 +0000)
am: 80c2eeedbb

Change-Id: I3183c725f1c8246481543832644518d5a2f566c0


Trivial merge