OSDN Git Service

Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 01:00:05 +0000 (01:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 01:00:05 +0000 (01:00 +0000)
am: 54e508ca63

Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f

1  2 
AndroidManifest.xml

Simple merge