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:22:24 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 May 2016 23:22:24 +0000 (23:22 +0000)
am: 53380a8386  -s ours

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

Change-Id: I2f922b9e4551849017b6523eb2c8c640870f8b64


Trivial merge