| commit | 81be7ce4606e5bdcdc2d1785ad8fc39d49767360 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Fri Aug 21 09:49:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 09:49:11 2015 +0000 |
| tree | 997e7486b67e0cca770930c4501eeda27c58ef73 | |
| parent | efe8307df19eef5285cca0f5213f4dfbc1a661b6 [diff] | |
| parent | 0a8f0b10b7a63129050dbc45ccf7113f45b487b8 [diff] |
am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev * commit 'b60bc0ece2b2714845eff37c97cb19d41a308122': Allow debugging only for apps forked from zygote