tree 19db2356454ec5eb501001f62a32059cdff79e2c
parent 0ca37573e53bc3a481daa3a807dfc6960227fb0f
parent f193546d65d41d40bd0e24e9bfe443001a320d1a
author Baligh Uddin <baligh@google.com> 1463094319 +0000
committer android-build-merger <android-build-merger@google.com> 1463094319 +0000

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
am: f193546d65  -s ours

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

Change-Id: I3fe077a1b75e67963cfbcc7430912afd5143d418