tree 9dd4d809c432c3b0da81e1e87996d5c85e2e9196
parent 0cc1982580e8c5c4df519b135b62c662158146b2
author Eino-Ville Talvala <etalvala@google.com> 1471387685 -0700
committer Zach Jang <zachjang@google.com> 1472582315 +0000

Camera metadata: Check for inconsistent data count

Resolve merge conflict for nyc-release
Also check for overflow of data/entry count on append.

Bug: 30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2
(cherry picked from commit e9e44f797742f52996ebf307740dad58c28fd9b5)