tree 927a03a623d8175751cbf4a4c05259cf1950f23a
parent 64a7a89d286a263af5565da947819ce64162c977
parent 8a22c41bf5f889485e3103c896516a4b3bcc5d36
author Yin-Chia Yeh <yinchiayeh@google.com> 1465339029 +0000
committer android-build-merger <android-build-merger@google.com> 1465339029 +0000

Merge \"Camera: document expected timestamp source\" into nyc-dev
am: 8a22c41bf5

Change-Id: Iebce5b3330a010356892b68ed22b82e100fe9012