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

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

Change-Id: I7391006c948be8188b8b197c1e318b76a826155a


Trivial merge