OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cd3bb9 4b39c15)
resolve merge conflicts of 4b39c15da0f5 to nyc-mr2-dev-plus-aosp
authorAjay Panicker <apanicke@google.com>
Tue, 14 Mar 2017 21:01:57 +0000 (14:01 -0700)
committerAjay Panicker <apanicke@google.com>
Tue, 14 Mar 2017 21:01:57 +0000 (14:01 -0700)
Change-Id: I7567db6d1fbb9f8a8b5e29c3e24cdff6508c4b6f

1  2 
core/res/AndroidManifest.xml patch | diff1 | diff2 | blob | history

diff --cc core/res/AndroidManifest.xml
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help