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:
c76f44f
a2ffb20
)
Merge \\"resolve merge conflicts of ac5b340 to nyc-dev\\" into nyc-dev am: 6ec78a6458
author
Dan Yu
<dsyu@google.com>
Tue, 28 Jun 2016 16:32:01 +0000
(16:32 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 28 Jun 2016 16:32:01 +0000
(16:32 +0000)
am:
a2ffb20c06
Change-Id: I4f859ca20376c10f1638ce80b2ec33b515815809
Trivial merge