OSDN Git Service

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7...
authorBaligh Uddin <baligh@google.com>
Thu, 12 May 2016 23:10:35 +0000 (23:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 May 2016 23:10:35 +0000 (23:10 +0000)
commite3b631a5d62923a381bf0ecb151a1ec9c584380c
treef724efd55678975833c2c6af4a50cd63f63df18f
parentd4b8d2b59f804544e09cb3e600ff290792470999
parente038da17f38eac01e6c971d9f5956ea701a341e2
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours
am: e038da17f3  -s ours

* commit 'e038da17f38eac01e6c971d9f5956ea701a341e2':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: Ice12c95006ab0b10fa2d2a6413925001249564d8