| commit | 0ab6293edb4089bac73229bcfdc40e40a08a4e68 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Fri Aug 21 10:29:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 10:29:28 2015 +0000 |
| tree | d67785920a2542a4a212b2a13529fb614d1e8c61 | |
| parent | 6578ad5bb493d43ae6a1f8a0b0d6dd180aa90b50 [diff] | |
| parent | 534553579228d7802b410b4cec41b8c0f4fd9079 [diff] |
am 53455357: am b56c6437: am b1d01411: am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev * commit '534553579228d7802b410b4cec41b8c0f4fd9079': Allow debugging only for apps forked from zygote