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:
b371102
7ee7013
)
DO NOT MERGE ANYWHERE am: 53e5c05d83 -s ours
author
Erik Kline
<ek@google.com>
Wed, 5 Jul 2017 11:21:09 +0000
(11:21 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 5 Jul 2017 11:21:09 +0000
(11:21 +0000)
am:
7ee7013a83
-s ours
Change-Id: I44bff19c301019e0d8be6d2a799242cd6b01a6e6
Trivial merge