tree df3ee92a1c68c9d9e7d086e0cd4f03fa49a5704e
parent 3a8e28c1d7dc474b70e937774de5eba70d528674
parent a78601dc1929428007fdbb07da0a07ae3fb60bd5
author RoboErik <epastern@google.com> 1412873206 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412873206 +0000

am a78601dc: Merge "Ensure metadata bundles are unparceled before making them available" into lmp-dev

* commit 'a78601dc1929428007fdbb07da0a07ae3fb60bd5':
  Ensure metadata bundles are unparceled before making them available