| commit | 083cacc91a8eeed53c8899e59c4549534d5be662 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Mar 06 01:13:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 06 01:13:51 2015 +0000 |
| tree | 7eb5f87b6ca8f340bdf07a768221a5128c564ff3 | |
| parent | 9aa4aecf671b0d616623258c44f93c09baa7bf9c [diff] | |
| parent | a0dfad5588711691d9771e6ea93733e539bfd7e2 [diff] |
am a0dfad55: am bb21fe8a: resolved conflicts for merge of 8be3e779 to stage-aosp-master * commit 'a0dfad5588711691d9771e6ea93733e539bfd7e2': move untrusted_app statement to the correct file.