tree 58a9dc396820780f2b500f8687c15cc8d65c4bc5
parent f997eda93e796e9849d504c7e9ef9c825755671e
parent d93305aff9c85a73e74d9370b97f41fcbf8b8f42
author TreeHugger Robot <treehugger-gerrit@google.com> 1475284078 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1475284080 +0000

Merge "DO NOT MERGE: CameraITS: backport caps from master" into nyc-mr1-dev