am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

Browse Source

* commit 'b60bc0ece2b2714845eff37c97cb19d41a308122':
  Allow debugging only for apps forked from zygote

...

This commit is contained in:

Sebastien Hertz

2015-08-21 09:49:11 +00:00

committed by Android Git Automerger

parent ddc2536d2b b60bc0ece2

commit c5151d2c37

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available