| commit | a0dfad5588711691d9771e6ea93733e539bfd7e2 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Mar 06 01:05:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 06 01:05:59 2015 +0000 |
| tree | 79a6e8dec51f82fe2c9ff585bf81ff8dccf54be2 | |
| parent | 26f2337762096f16e335e070c3a3e80aaa62a29f [diff] | |
| parent | bb21fe8a861ecbab6cd5e768b0a4ff62e60068b6 [diff] |
am bb21fe8a: resolved conflicts for merge of 8be3e779 to stage-aosp-master * commit 'bb21fe8a861ecbab6cd5e768b0a4ff62e60068b6': move untrusted_app statement to the correct file.