tree c0b347815653221b96bcf281a23bdfb31d3d47f5
parent 386b225600f0f17181c58c82062a9bbbb9bcc22c
parent 5e1b92c054551708c8652530830f859613d666e4
author RoboErik <epastern@google.com> 1413442482 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413442482 +0000

am 5e1b92c0: am 56d8876f: am 0dfd86e0: am c7be69f1: Merge "Don\'t call size on a null metadata" into lmp-dev

* commit '5e1b92c054551708c8652530830f859613d666e4':
  Don't call size on a null metadata