OSDN Git Service

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

Change-Id: I4f4a64f99ee6dbf29a7e7769a0552233a5e45b2a


Trivial merge