OSDN Git Service

Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
authorPhil Weaver <pweaver@google.com>
Wed, 30 Aug 2017 23:40:22 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 23:40:22 +0000 (23:40 +0000)
commit666e08ab155cc3b4a21df5676b883a95c80f28b6
tree559a3a46dec37c8b6954181528b3776489d7aa96
parent99317517cb21a5d54ee19e629a4aadc046fbece6
parent0ddaa63b6716d40b1d7988e9e224c31472a0d633
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
am: 0ddaa63b67

Change-Id: I84cdc92d542597541266fe506b4a3af160d970b2
api/system-current.txt
core/res/AndroidManifest.xml