diff options
author | Jeff Sharkey <jsharkey@android.com> | 2014-12-01 20:07:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-01 20:07:14 +0000 |
commit | 7f9eeaf4c1a5a462d335840baec32eaca7fb087e (patch) | |
tree | 6f3de36c7c07269e761fb91461fdffef6a7214a3 | |
parent | b06a35716d91bf53afa1ea7698d0de16bd614c8c (diff) | |
parent | 2f8f394b14ab0ed6b65ce440a2ddc8aa09fbb8fa (diff) | |
download | frameworks_base-7f9eeaf4c1a5a462d335840baec32eaca7fb087e.zip frameworks_base-7f9eeaf4c1a5a462d335840baec32eaca7fb087e.tar.gz frameworks_base-7f9eeaf4c1a5a462d335840baec32eaca7fb087e.tar.bz2 |
am 2f8f394b: resolved conflicts for merge of 916d5163 to lmp-mr1-dev-plus-aosp
* commit '2f8f394b14ab0ed6b65ce440a2ddc8aa09fbb8fa':
APK still has privileged flag after being moved from "/system/priv-app"
0 files changed, 0 insertions, 0 deletions