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:
23e117a
83dcc26
)
DO NOT MERGE: Cross profile candidate should be considered am: ff11122ddc
author
Tony Mak
<tonymak@google.com>
Tue, 20 Dec 2016 17:02:16 +0000
(17:02 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Dec 2016 17:02:16 +0000
(17:02 +0000)
am:
83dcc26065
-s ours
Change-Id: I57fe241a3a1aa961eee8b04799600cbfc7e619e0
Trivial merge