tree a49fa519b1d0e93c21e2979bed2324f949604b87
parent 63f8a2f73cebdd757914a7e0fcb874cc3e965708
parent 9d0b4e6b950289334d2b75bdef7dd2dac98cdd8d
author Adam Cohen <adamcohen@google.com> 1418065895 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418065895 +0000

am 9d0b4e6b: am 3b5f5f28: Fix regression wherein correct activity flags weren\'t being set

* commit '9d0b4e6b950289334d2b75bdef7dd2dac98cdd8d':
  Fix regression wherein correct activity flags weren't being set