diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2013-07-08 15:37:11 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-08 15:37:11 -0700 |
commit | 6760cfd1a6d3982664275ae02835a3dd72b30cac (patch) | |
tree | 6485364758416639bcbfc8c74c7db2f25234b3ae /media/libeffects/testlibs | |
parent | 9046684244e6adaf4db46f1a5e5b1fea221cd781 (diff) | |
parent | 291967728b02ad9a7d5545b0eb1ec0c4c3d664af (diff) | |
download | frameworks_av-6760cfd1a6d3982664275ae02835a3dd72b30cac.zip frameworks_av-6760cfd1a6d3982664275ae02835a3dd72b30cac.tar.gz frameworks_av-6760cfd1a6d3982664275ae02835a3dd72b30cac.tar.bz2 |
am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '291967728b02ad9a7d5545b0eb1ec0c4c3d664af':
Diffstat (limited to 'media/libeffects/testlibs')
0 files changed, 0 insertions, 0 deletions