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:10:58 +0000 (01:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 01:10:58 +0000 (01:10 +0000)
am: 72c56fb84a  -s ours

Change-Id: Ib0b35737306bce22a49bddeea0d7abdc8ecb1bc3


Trivial merge