OSDN Git Service

Merge "Back-port fixes for b/62196835" into nyc-mr1-dev am: 4a1dc3458d am: a84f7a3028...
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 01:24:21 +0000 (01:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 01:24:21 +0000 (01:24 +0000)
am: cbc1e6afe9

Change-Id: Id52ab73ff87b5045bd3ccebd93343cf18712bfb1


Trivial merge