tree 532fdee2fa3cd572fe05ff8cd0c8321360bab1a0
parent 6f372bb723a87bb6c292067a848e1c4aa8153107
parent 62dacd6797f6aab0f096e440418cd5fe4e9d9ea3
author Michael Jurka <mikejurka@google.com> 1383928455 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383928455 -0800

am 62dacd67: Merge "Uncommenting throw when item not contained in sBgItemsIdMap" into jb-ub-now-jolly-elf

* commit '62dacd6797f6aab0f096e440418cd5fe4e9d9ea3':
  Uncommenting throw when item not contained in sBgItemsIdMap