tree 4da3fac31d03edbc8fe1c4b0cebdc055ab9a539e
parent f23b29ad5a730c7b26d9f96c764dc4e0d96fdd16
parent 4bf0356ee2058c7f033a41e02fa3eb86909c450c
author Amith Yamasani <yamasani@google.com> 1413324241 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413324241 +0000

am 4bf0356e: am 15a5f82f: Merge "Hide DISALLOW_OUTGOING_BEAM API" into lmp-dev

* commit '4bf0356ee2058c7f033a41e02fa3eb86909c450c':
  Hide DISALLOW_OUTGOING_BEAM API