| commit | 79e5a2c9a395623fb568a4e5eac5fe66c0ea0932 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Fri Sep 25 18:09:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 25 18:09:26 2015 +0000 |
| tree | d8b6338ed681584df2664d5e3c43e70094e7092f | |
| parent | f5f8794b92819409a36ae7bee2e192bf72575f66 [diff] | |
| parent | fb366bfb282a40c1051037078548118e7e47bc77 [diff] |
am b6b5eff9: (-s ours) am 1728de00: Merge "add recovery mechanism on CORE_RESET_NTF" * commit 'b6b5eff984e86128ba8e0bfb2a53a6aab27afe89': add recovery mechanism on CORE_RESET_NTF