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:
c547eed
afab98a
)
DO NOT MERGE Fix build am: dfedca4e43 -s ours am: 499871ebe9 am: 3ea1f124f9 am:...
author
Jaewan Kim
<jaewan@google.com>
Thu, 22 Sep 2016 22:51:23 +0000
(22:51 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 22 Sep 2016 22:51:23 +0000
(22:51 +0000)
am:
afab98a69e
-s ours
Change-Id: I8ddca6c69539eb9cc568e5fcec011a3c58450fcc
Trivial merge