OSDN Git Service

resolve merge conflicts of 83c367aa5b48 to stage-aosp-master
authorNeil Fuller <nfuller@google.com>
Wed, 20 Sep 2017 14:55:08 +0000 (14:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Sep 2017 14:55:08 +0000 (14:55 +0000)
commit93fcfbc8cbf291eccc0eaa41ef3dbdaecfa7dc77
treec8f19eefb9c5967d00486bbbb75a1640270306ec
parent56ed1f9c9d607e73d1e1972fb7c359686f5f70bb
parent8acdb8aa654d3cc7511ea77420849398487f4fcb
resolve merge conflicts of 83c367aa5b48 to stage-aosp-master
am: 8acdb8aa65

Change-Id: I7605323c886c9dafb83899c8b78e2bb860f96bb4
core/res/AndroidManifest.xml