OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be7621e
3b76c25
)
Merge "DO NOT MERGE Fix build failure due to missing guava target" into nyc-mr2-dev...
author
Steven Ng
<stevenckng@google.com>
Wed, 17 May 2017 22:49:14 +0000
(22:49 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 17 May 2017 22:49:14 +0000
(22:49 +0000)
am:
3b76c25cee
-s ours
Change-Id: I6b9f260b8494ced24cd758207981d60c9a5ca97e
Trivial merge