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:
1af850f
b9fc12d
)
Merge changes I325b13d5,I89719fe7 am: 23868e9c09 am: 9335d2d0b1 am: 4fa0187015
author
Lorenzo Colitti
<lorenzo@google.com>
Sat, 19 Aug 2017 03:47:59 +0000
(
03:47
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 19 Aug 2017 03:47:59 +0000
(
03:47
+0000)
am:
b9fc12d1d2
-s ours
Change-Id: Iddb0b4e22d942c9b399e57e17328b6911f473064
Trivial merge