summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/AsyncQueryHandler.java
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-01-07 22:09:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-07 22:09:11 +0000
commitec64c0b6e639b743398fb543218100fdaf9a7f69 (patch)
tree463a74a7beb1e9ac708738e2e3c5436dbd717370 /core/java/android/content/AsyncQueryHandler.java
parente02fe5afac0bc792559a4c424ffc8391c501abfe (diff)
parent022b1ba188b249b0f17d1b5e8ab3badbc529f98e (diff)
downloadframeworks_base-ec64c0b6e639b743398fb543218100fdaf9a7f69.zip
frameworks_base-ec64c0b6e639b743398fb543218100fdaf9a7f69.tar.gz
frameworks_base-ec64c0b6e639b743398fb543218100fdaf9a7f69.tar.bz2
am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
* commit '022b1ba188b249b0f17d1b5e8ab3badbc529f98e': Core/jni: Disallow relocation for decryption
Diffstat (limited to 'core/java/android/content/AsyncQueryHandler.java')
0 files changed, 0 insertions, 0 deletions