OSDN Git Service

Merge \"Camera: document expected timestamp source\" into nyc-dev
authorYin-Chia Yeh <yinchiayeh@google.com>
Tue, 7 Jun 2016 22:37:09 +0000 (22:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 22:37:09 +0000 (22:37 +0000)
am: 8a22c41bf5

Change-Id: Iad645be722f64d13f58d34cd6aea2554785ee9fc


Trivial merge