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:
0ca3757
f193546
)
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
author
Baligh Uddin
<baligh@google.com>
Thu, 12 May 2016 23:05:19 +0000
(23:05 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 12 May 2016 23:05:19 +0000
(23:05 +0000)
am:
f193546d65
-s ours
* commit '
f193546d65d41d40bd0e24e9bfe443001a320d1a
':
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418
Trivial merge