OSDN Git Service

Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT...
authorKevin Hufnagle <khufnagle@google.com>
Fri, 1 Dec 2017 21:16:57 +0000 (21:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Dec 2017 21:16:57 +0000 (21:16 +0000)
am: 22d290b289

Change-Id: I994b9e0f7ea2b585c4f8f03231ed4d4c92e7e18e

1  2 
core/res/AndroidManifest.xml

Simple merge