tree 03983b6a57d039ffd1180858978f947bdfcc518f
parent 9870ad94ed4dd1a60e4122b94cd8b72bbb06ca24
parent 0034743236bf69dd26edd757be03dc41f030b280
author Zhijun He <zhijunhe@google.com> 1460158239 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460158241 +0000

Merge "Camera2: update API per API council review" into nyc-dev