| commit | 2f4d0ffd5a503179555d83163bcdb20a9a8e2f98 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Fri Aug 21 10:10:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 10:10:18 2015 +0000 |
| tree | cbcc19f512d92178b25da7ab9ce04eaaabc3ae16 | |
| parent | 0996c24b1428d057f199d3cdf348e36797cf2021 [diff] | |
| parent | 750310ff7b32a4e52090064d944bf0f5f6221212 [diff] |
am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev * commit '5d2faf111e18fc44163ec4fe3cc8c6151d3e6aeb': Allow debugging only for apps forked from zygote