| commit | c5151d2c378e4dad4d1312caf2021d7515297d06 | [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 | e7a47c1f7e157a18f71ce79b3f9f899dda00dfef | |
| parent | ddc2536d2b6f277a7828278a066be874e4f9502e [diff] | |
| parent | b60bc0ece2b2714845eff37c97cb19d41a308122 [diff] |
am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev * commit 'b60bc0ece2b2714845eff37c97cb19d41a308122': Allow debugging only for apps forked from zygote