summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2015-10-14 23:52:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-14 23:52:14 +0000
commitb248077a8a239fe6fe28775a7472a89ff42fdec3 (patch)
treeeb74989b2f89b21b8a0d0616ac699553705fb832 /core/jni
parent8fb8c37ca7c2c57466b07548effa24044e5b3ef6 (diff)
parent2eac005bbfc94a774c0a3f870fd393a3e7389f8c (diff)
downloadframeworks_base-b248077a8a239fe6fe28775a7472a89ff42fdec3.zip
frameworks_base-b248077a8a239fe6fe28775a7472a89ff42fdec3.tar.gz
frameworks_base-b248077a8a239fe6fe28775a7472a89ff42fdec3.tar.bz2
am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev
* commit '2eac005bbfc94a774c0a3f870fd393a3e7389f8c': Fix bugs introduced in ChooserActivity
Diffstat (limited to 'core/jni')
0 files changed, 0 insertions, 0 deletions