OSDN Git Service

am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be resto...
authorJeff Vander Stoep <jeffv@google.com>
Tue, 23 Sep 2014 16:50:29 +0000 (16:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Sep 2014 16:50:29 +0000 (16:50 +0000)
commit5ba31e6e9afb34781fe5b927354502d9c6190bc5
tree56799a3ee6bc7af4cf0a47febd494b8e61ee2df7
parent1b4f1a794dc90c1ea877af64e8340afe6146584a
parentbba797957a83b0ee8869cfa8a9427f6506f74fa4
am bba79795: am 25c866a8: am e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev

* commit 'bba797957a83b0ee8869cfa8a9427f6506f74fa4':
  Sanity-check paths of files to be restored
services/java/com/android/server/BackupManagerService.java