OSDN Git Service

Merge "Back-port ag/2491664" into mnc-dev
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 23:29:03 +0000 (23:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 23:29:03 +0000 (23:29 +0000)
am: 7b3ca9886e

Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db

1  2 
AndroidManifest.xml

Simple merge