tree f8177c2655205ed9aa9bb6041652725ed91b460d
parent 8e7a2b4d13bff03973dbad2bfb88a04296140433
author Eino-Ville Talvala <etalvala@google.com> 1471387685 -0700
committer Adam Seaton <aseaton@google.com> 1472080623 +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