summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-08-02 17:58:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-02 17:58:47 -0700
commit14c8056525cfb5060a68fa2ed5f41fb6d1587873 (patch)
treefb48d8e067210202e2ebf53fa1c4791317bc7a84
parent1cad5b21e4014e013fdc169f100bf36146802c0b (diff)
parenta43e27016410910e9d11c09e981e58743ee9439e (diff)
downloadpackages_apps_Settings-14c8056525cfb5060a68fa2ed5f41fb6d1587873.zip
packages_apps_Settings-14c8056525cfb5060a68fa2ed5f41fb6d1587873.tar.gz
packages_apps_Settings-14c8056525cfb5060a68fa2ed5f41fb6d1587873.tar.bz2
am a43e2701: (-s ours) am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
* commit 'a43e27016410910e9d11c09e981e58743ee9439e': Completely remove app ops activity.
0 files changed, 0 insertions, 0 deletions