OSDN Git Service

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

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

Change-Id: I65fd87879662e05d3906d530d5cba3e0d313990c


Trivial merge