OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f2fffc9
5d925fc
)
DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09 -s ours
author
Robert Shih
<robertshih@google.com>
Thu, 14 Jul 2016 23:06:31 +0000
(23:06 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 14 Jul 2016 23:06:31 +0000
(23:06 +0000)
am:
5d925fce78
-s ours
Change-Id: Ie8c4b4df445063c09bfaf9a1e987798c6d1df978
Trivial merge