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:
af5875d
3c9b364
)
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1
author
Andrew Scull
<ascull@google.com>
Fri, 13 Jan 2017 21:23:27 +0000
(21:23 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 13 Jan 2017 21:23:27 +0000
(21:23 +0000)
am:
3c9b36482f
Change-Id: I2eb73ac546ce8be144ec96fcac573caa2c5e8a13
Trivial merge