summaryrefslogtreecommitdiffstats
path: root/media/jni/mediaeditor
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-19 11:31:44 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-19 11:31:44 -0800
commit71bb6a2a3eb668fe7459cd8fff1f65a15804c3be (patch)
tree7d6b9632d030b316309de242e83873ea58e30e81 /media/jni/mediaeditor
parent7666ebd9f29df718f57354e0317db2ccbe6369b0 (diff)
parent0cf2616faca9110a761f9d85c7e6cc5c1a5c689f (diff)
downloadframeworks_base-71bb6a2a3eb668fe7459cd8fff1f65a15804c3be.zip
frameworks_base-71bb6a2a3eb668fe7459cd8fff1f65a15804c3be.tar.gz
frameworks_base-71bb6a2a3eb668fe7459cd8fff1f65a15804c3be.tar.bz2
Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
Diffstat (limited to 'media/jni/mediaeditor')
0 files changed, 0 insertions, 0 deletions