tree 79c862e642a7923cf1e72398fa28b5650cba9686
parent eb2d4dbb024ed34a9f34acc7010de948d9380158
parent 6a766a2e3000cb58dafac5a1a482e00b68b9bc11
author Miao Wang <miaowang@google.com> 1446851234 +0000
committer android-build-merger <android-build-merger@google.com> 1446851234 +0000

Merge "Make Gallery2 use platform RenderScript" am: 9f16042f46
am: 6a766a2e30

* commit '6a766a2e3000cb58dafac5a1a482e00b68b9bc11':
  Make Gallery2 use platform RenderScript