tree 07456a6307d1804376d51214e49698e2887ac1be
parent 4c035efb5511dc259a0f4b8565001c364d0b1830
parent 382ec478d1ed1576d25d51205a1c67b190174172
author Elliott Hughes <enh@google.com> 1428606385 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428606385 +0000

am 382ec478: am 52222a58: Merge "Move file paging into ScreenRecoveryUI."

* commit '382ec478d1ed1576d25d51205a1c67b190174172':
  Move file paging into ScreenRecoveryUI.