tree c97493f42d6a19b2838071299c508d099a2e8d65
parent 3e62e9d93e97e39c260b62ac230002ae21ed4d96
parent 4da9cdeab97297e69075dd9b6cad9921cfae30b9
author Brian Carlstrom <bdc@google.com> 1414102528 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414102528 +0000

am 4da9cdea: am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-dev

* commit '4da9cdeab97297e69075dd9b6cad9921cfae30b9':
  Log to UI any metadata setting errors