OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e5ebdc3
a5fc11d
)
Merge "AAPT2: Add targetConfig to AndroidManifest.xml" into oc-mr1-dev
author
Adam Lesinski
<adamlesinski@google.com>
Mon, 7 Aug 2017 22:28:43 +0000
(22:28 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 7 Aug 2017 22:28:43 +0000
(22:28 +0000)
am:
a5fc11d78e
Change-Id: Id751b5a4c087fa062a31e88e153302a326fe34a8
Trivial merge