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:
6f85d83
21a3293
)
DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09 -s ours am...
author
Robert Shih
<robertshih@google.com>
Thu, 14 Jul 2016 23:14:32 +0000
(23:14 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 14 Jul 2016 23:14:32 +0000
(23:14 +0000)
am:
21a32935cb
-s ours
Change-Id: I94403eab4f73289a80cd126c2f66faef3657bdd1
Trivial merge