tree bf8798aa5b3f3f427a3f32b8ab58a39bcb0cf68b
parent 77df46efec7996325cbdb17b67bcecbbe88bfa6b
parent 63847c39a64e7ab0a5e8564d887864c02a7ba2a5
author Baligh Uddin <baligh@google.com> 1463095196 +0000
committer android-build-merger <android-build-merger@google.com> 1463095196 +0000

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours am: e038da17f3  -s ours am: e3b631a5d6  -s ours am: 7e806813bb  -s ours am: e20dd6dca2  -s ours
am: 63847c39a6  -s ours

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

Change-Id: I289fc7b1d9ef94d6a298cfbd64ee6f66e8790b64