tree 57c95e514b7d147524b89b8252fa6e1c4e76f5af
parent a1d7a123c40239178c2ca54b38fac9ea83e7ecc8
parent 7005b67c127d229017840925d2bc1bd84c43aaf5
author Eino-Ville Talvala <etalvala@google.com> 1366325087 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366325087 +0000

Merge "Camera: Add hidden camera preview to renderscript allocation API"