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:
ff7e594
a7338f1
)
Merge \\\"resolve merge conflicts of ac5b340 to nyc-dev\\\" into nyc-dev am: 6ec78a64...
author
Daniel Yu
<dsyu@google.com>
Tue, 28 Jun 2016 16:42:11 +0000
(16:42 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 28 Jun 2016 16:42:11 +0000
(16:42 +0000)
am:
a7338f1467
Change-Id: I7d5f58b1bb4467d3f111baebb1cf5dcb5a7da6e8
Trivial merge