tree a0e8b44a301aecf7fa2dcb1a39116a198d68aaba
parent 1d6fbcc389ecb9f418076e8ab5f4c93a5d911de9
parent 85c7c08e2511509a306c3a5b202ceda922f5f2b5
author Elliott Hughes <enh@google.com> 1429982644 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429982644 +0000

am 85c7c08e: am d5aa67cc: Merge "Wait for completion of device mapping in mountObb"

* commit '85c7c08e2511509a306c3a5b202ceda922f5f2b5':
  Wait for completion of device mapping in mountObb