tree 9be51182f923e1492e8d5f398c0ff4bbd906cc89
parent aec9064773c012566e569425467dd2645a84b23e
parent 095e4663d6062c7005a1aa49e652529c6c5db97e
author Igor Murashkin <iam@google.com> 1359601181 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359601181 -0800

am 095e4663: (-s ours) Camera2: Docs - Add output_file option to metadata_parser_xml.py: DO NOT MERGE

# Via Igor Murashkin
* commit '095e4663d6062c7005a1aa49e652529c6c5db97e':
  Camera2: Docs - Add output_file option to metadata_parser_xml.py: DO NOT MERGE