tree 27e8fab5854e3779d0521be77edb3392b5567a0b
parent 40014e1db563946999dac2ded00345e6e92207eb
parent c7d477bb7d9d2391ad3d26bbe4718e7956597d20
author Wei Liu <luciferleo@google.com> 1412722937 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412722937 +0000

am c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev

* commit 'c7d477bb7d9d2391ad3d26bbe4718e7956597d20':
  Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable.