tree 4e6a7185c2e6eefb4f7060d9905284f85045e709
parent fb198383cc3c786ed303e49e29c8d0b86f38be73
author Igor Murashkin <iam@google.com> 1359592311 -0800
committer Igor Murashkin <iam@google.com> 1359592311 -0800

Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE

This reverts commit 52f92faa60d4e5300e194e6ded3d290fcf4df241.