tree 2d928ea084620bbd8d13d7cf7c2f405f5b75e706
parent 660af7eb1a55e2df7da45aa63ca227141ef86b34
parent e2adb1ff4af09d66096df64461c80d4126ab2692
author Jeff Vander Stoep <jeffv@google.com> 1411489476 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411489476 +0000

am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev

* commit 'e2adb1ff4af09d66096df64461c80d4126ab2692':
  Sanity-check paths of files to be restored