summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-04-30 23:59:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-30 23:59:40 +0000
commitc6b8225e759d1790d9a38082a18ce7e24a3dba27 (patch)
tree8a44a3532afe19e468d8458f611fa713cb5cd60a /media
parentd1adad7acdff96f6518935214d93a655cc447570 (diff)
parent3c782246d5ee9869f2167a00df748eac1b9e9153 (diff)
downloadframeworks_av-c6b8225e759d1790d9a38082a18ce7e24a3dba27.zip
frameworks_av-c6b8225e759d1790d9a38082a18ce7e24a3dba27.tar.gz
frameworks_av-c6b8225e759d1790d9a38082a18ce7e24a3dba27.tar.bz2
am 3c782246: am b1d2b51c: am 761636f3: Merge "Do not force all command-line apps to be 32-bit only"
* commit '3c782246d5ee9869f2167a00df748eac1b9e9153': Do not force all command-line apps to be 32-bit only
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions