OSDN Git Service

Merge "Merge "Back-port fixes for b/62196835" into mnc-dev am: 093c7a8e56 am: 0ddd7e4...
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 01:02:01 +0000 (01:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 01:02:01 +0000 (01:02 +0000)
am: 54cf73ebd9

Change-Id: Ib6dab0953e81ce350e08fbe70df86e836d58a2c1


Trivial merge