commit | 7abd7ba0932e882a8c4cea87a79de3e05c8451af | [log] [tgz] |
---|---|---|
author | Benjamin Franz <bfranz@google.com> | Thu Jul 21 10:05:33 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 21 10:05:33 2016 +0000 |
tree | a995dd8dd52c65b9fbaa517506b8c996e650c816 | |
parent | a09b6ee1650ebef2dca053cdd72cdeb8cbbf7737 [diff] | |
parent | 3e582390b3cfcf82f51ac11d6d8f5074a91fb44b [diff] |
Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev am: 3e582390b3 Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8