tree 07456a6307d1804376d51214e49698e2887ac1be
parent 36640972b04c0b91207583e35f78acded4a28190
parent 52222a58417e7e6349e91e19e4f5e293a3a971c5
author Elliott Hughes <enh@google.com> 1428604313 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428604313 +0000

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

* commit '52222a58417e7e6349e91e19e4f5e293a3a971c5':
  Move file paging into ScreenRecoveryUI.