summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-04-21 16:06:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-21 16:06:05 +0000
commit6fca81de9b2079ec88e785f58bf49bf1f0c105e2 (patch)
treec6a3bda66245d291aea6d2d648f6bc4f26cf0ee5 /media
parent06661993037c28d2e189bfe809304a5d0e3ba5d8 (diff)
parent717884ea102e2ba7f4d35e25cc2486fd18e8a0d1 (diff)
downloadframeworks_base-6fca81de9b2079ec88e785f58bf49bf1f0c105e2.zip
frameworks_base-6fca81de9b2079ec88e785f58bf49bf1f0c105e2.tar.gz
frameworks_base-6fca81de9b2079ec88e785f58bf49bf1f0c105e2.tar.bz2
am 717884ea: (-s ours) am 9df9ad7e: am 2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
* commit '717884ea102e2ba7f4d35e25cc2486fd18e8a0d1': Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions