tree 15b486ba5fbc4894f611b0fbf60a4c9373868914
parent aebeea4cf39acae833b1b7f27a4c08d3b55dee37
parent cfa979b200a016dd24e851e0da0ce956aa932e2e
author Xia Wang <xiaw@google.com> 1358205283 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358205283 -0800

am cfa979b2: am b88564d2: am 12798957: am d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev

* commit 'cfa979b200a016dd24e851e0da0ce956aa932e2e':
  Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.