tree e9a8f58c48b9619ba5178e34954d74e9e4ff9147
parent c8d42e9c4f8838171aa903647f68ecdea4cd7143
parent 621b26ec000050e64a1deea40b436ab6ebccf112
author Zhijun He <zhijunhe@google.com> 1402709917 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402551282 +0000

Merge "Camera2: Add timestampCalibration tag"