tree 6a9d2a8ea7aab43a9b05a0d2bf452e93d911dca3
parent 5c918ee029276efe090e82086fd4089d7686e60f
parent ab4d62929412556b90f8927fb05602d2e630518c
author Adam Lesinski <adamlesinski@google.com> 1456170259 +0000
committer android-build-merger <android-build-merger@google.com> 1456170259 +0000

Merge "DO NOT MERGE ANYWHERE: Hack to get devices booting again." into mnc-dr-dev am: d201f48687  -s ours
am: ab4d629294  -s ours

* commit 'ab4d62929412556b90f8927fb05602d2e630518c':
  DO NOT MERGE ANYWHERE: Hack to get devices booting again.