tree 16eace3fc7a76b749ff7c9df5869bc42cbabcf56
parent 83fd156e2173ff65fd8afdaca1ccd20fc91a5d33
parent d201f486871e825e713ae0df2f2f01e3dfff94d8
author Adam Lesinski <adamlesinski@google.com> 1456169492 +0000
committer android-build-merger <android-build-merger@google.com> 1456169492 +0000

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

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