summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorBen Komalo <benkomalo@google.com>2011-09-19 16:52:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-19 16:52:37 -0700
commit85a61c4d6fedff2f1539e4cfff4b173ce0a28a3f (patch)
tree5eb4e81dc032d820d8bfc7409e3edce6c8287aa3 /core/java/android
parent6c03850616a6e87de3e1943e47605cc5ebb20e2b (diff)
parent553acf0409619ccde09332fb8af3e0b5c7cc4752 (diff)
downloadframeworks_base-85a61c4d6fedff2f1539e4cfff4b173ce0a28a3f.zip
frameworks_base-85a61c4d6fedff2f1539e4cfff4b173ce0a28a3f.tar.gz
frameworks_base-85a61c4d6fedff2f1539e4cfff4b173ce0a28a3f.tar.bz2
Merge "Only run "core" apps when encrypting device." into ics-factoryrom
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions