tree 08d43f76c4e525d5bdf5a20dfd20874a31450040
parent 1c549446d185908a5c5b192c1efb81c8a32e06ae
parent 20864b088d1fd615f892f9415cf6ff634eeff9ff
author Miao Wang <miaowang@google.com> 1446865652 +0000
committer android-build-merger <android-build-merger@google.com> 1446865652 +0000

Merge "Revert "Make Gallery2 use platform RenderScript"" am: 643998123e
am: 20864b088d

* commit '20864b088d1fd615f892f9415cf6ff634eeff9ff':
  Revert "Make Gallery2 use platform RenderScript"