summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorWei Wang <weiwa@google.com>2015-05-01 07:59:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-01 07:59:07 +0000
commit342c22a5973386d5a5fdb0b552a26f51920cb026 (patch)
treeb05827180ec082dce75b80ebbb740ccb695b9458 /media/jni
parent25e99ce6d6e3191282a08b115d4b703277d19cd1 (diff)
parentf2cfe6c0a9c49d4e47c269ac1ff76b757d9dd8a9 (diff)
downloadframeworks_base-342c22a5973386d5a5fdb0b552a26f51920cb026.zip
frameworks_base-342c22a5973386d5a5fdb0b552a26f51920cb026.tar.gz
frameworks_base-342c22a5973386d5a5fdb0b552a26f51920cb026.tar.bz2
am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev
* commit 'f2cfe6c0a9c49d4e47c269ac1ff76b757d9dd8a9': Fix a bug in ScanSettings constructor.
Diffstat (limited to 'media/jni')
0 files changed, 0 insertions, 0 deletions