tree 5dc2b12efe6eaa4aee465f3704a25dadfa2044fe
parent 74f93f9a8c3d938755f010803e6f9b1e1476b7b1
parent 2327dd3f808c871f9e89772f06152052f6c74957
author Matthew Williams <mjwilliams@google.com> 1438983453 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438983453 +0000

am 2327dd3f: am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev

* commit '2327dd3f808c871f9e89772f06152052f6c74957':
  Correctly skip files that are excluded from restore