tree dce33589bdc35c35ef8d8c2cd36e52d52d56efa9
parent 52824dab7ba48713411ff3a26580b29aa2088242
parent 5ba31e6e9afb34781fe5b927354502d9c6190bc5
author Jeff Vander Stoep <jeffv@google.com> 1411491733 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411491733 +0000

am 5ba31e6e: am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev

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