tree a502c79fd5288f7200e8ae82675b4df701aaeb2c
parent 5f0af7fb8e54aea2bae823b5854d4e0d684cf233
parent e3219f070b9a224d964aea2658597ab0c917b9ad
author Igor Murashkin <iam@google.com> 1391826180 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1391826180 +0000

Merge "camera2: Add android.scaler.availableInputOutputFormatsMap"