am 2f8f394b: resolved conflicts for merge of 916d5163 to lmp-mr1-dev-plus-aosp

Browse Source

* commit '2f8f394b14ab0ed6b65ce440a2ddc8aa09fbb8fa':
  APK still has privileged flag after being moved from "/system/priv-app"

...

This commit is contained in:

Jeff Sharkey

2014-12-01 20:07:14 +00:00

committed by Android Git Automerger

parent b06a35716d 2f8f394b14

commit 7f9eeaf4c1

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