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:
51dfdad
7d13fe7
)
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev am: 1ae521df6a -s ours
author
Felipe Leme
<felipeal@google.com>
Sat, 20 Aug 2016 04:09:49 +0000
(
04:09
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 20 Aug 2016 04:09:49 +0000
(
04:09
+0000)
am:
7d13fe76be
-s ours
Change-Id: I7c12b1dac9a3a441fa18ed29bdc335d2e12f9355
Trivial merge