OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d77e7e
3749025
)
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am...
author
Zach Jang
<zachjang@google.com>
Wed, 22 Jun 2016 01:38:31 +0000
(
01:38
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 22 Jun 2016 01:38:31 +0000
(
01:38
+0000)
am:
3749025ccb
Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
Trivial merge