tree 6e383b4420b406f3130a42a9382934004afe0a3d
parent a2c159fede892a54b9b98e681c6a3053ab4dbf31
parent 3c1ff68d699be7157af0ea43adac27ad46bb6e56
author Zhijun He <zhijunhe@google.com> 1435085536 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1435085537 +0000

Merge "Camera2: update high speed recording API java doc" into mnc-dev