tree af46bcf20878cef7c912fdbacd82fe5a70bbedec
parent 964faa351815a86cf6832f261e71daf48af3d5c6
parent e546b879a5aa9c58a58fc1c5a2e3eb0123d4d5b2
author Xia Wang <xiaw@google.com> 1328122627 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328122627 -0800

am e546b879: am ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1

* commit 'e546b879a5aa9c58a58fc1c5a2e3eb0123d4d5b2':
  Fix a typo in image processing test