summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-06 10:16:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-06 10:16:23 +0000
commit721d0994dc6ed370e359a33a6798f87389a428c8 (patch)
tree017f6517b4c5de1faa66c743e9ca3f917ad20b0c /media/jni
parent30a061ed4ffb7360d55b610566ce47b57c058543 (diff)
parentf60b2d40b0b8dea2c83335c00fd7767008aa0abe (diff)
downloadframeworks_base-721d0994dc6ed370e359a33a6798f87389a428c8.zip
frameworks_base-721d0994dc6ed370e359a33a6798f87389a428c8.tar.gz
frameworks_base-721d0994dc6ed370e359a33a6798f87389a428c8.tar.bz2
am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."
* commit 'f60b2d40b0b8dea2c83335c00fd7767008aa0abe': Fix comment. It should be 'or' not 'of'.
Diffstat (limited to 'media/jni')
0 files changed, 0 insertions, 0 deletions