tree f724efd55678975833c2c6af4a50cd63f63df18f
parent d4b8d2b59f804544e09cb3e600ff290792470999
parent e038da17f38eac01e6c971d9f5956ea701a341e2
author Baligh Uddin <baligh@google.com> 1463094635 +0000
committer android-build-merger <android-build-merger@google.com> 1463094635 +0000

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