| commit | 750310ff7b32a4e52090064d944bf0f5f6221212 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Fri Aug 21 10:03:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 10:03:51 2015 +0000 |
| tree | 36e59a48ce3dffa16c0541209104ce6e1b2449fe | |
| parent | a769c12f37e568c35c209bbd7297d67bf630b567 [diff] | |
| parent | 81be7ce4606e5bdcdc2d1785ad8fc39d49767360 [diff] |
am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev * commit 'c5151d2c378e4dad4d1312caf2021d7515297d06': Allow debugging only for apps forked from zygote