| commit | d92746205e85b55e360e23393b0b71121b62ab43 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Fri Sep 25 18:16:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 25 18:16:24 2015 +0000 |
| tree | 4c3a42cfe03b501956b7bce789cf2dcdad112752 | |
| parent | 5051a7feaf2dccc026a406341356752125318c25 [diff] | |
| parent | 79e5a2c9a395623fb568a4e5eac5fe66c0ea0932 [diff] |
am 43215f16: am b6b5eff9: (-s ours) am 1728de00: Merge "add recovery mechanism on CORE_RESET_NTF" * commit '43215f165e37c711dbf87aca3f147a8b48b9ef1c': add recovery mechanism on CORE_RESET_NTF