OSDN Git Service

am 6dc2ac39: (-s ours) am 9d929558: Merge "Correctly skip files that are excluded...
authorMatthew Williams <mjwilliams@google.com>
Thu, 27 Aug 2015 10:11:24 +0000 (10:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:11:24 +0000 (10:11 +0000)
commit5f02146c82c57ba85d7d900fe0e28d0aa8f910c4
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent02bffbf14cfb348aa9fa2ba1fb6d48e3edfd232a
parent6dc2ac39e5913ceb5348d2e1e41af0ac95f59592
am 6dc2ac39: (-s ours) am 9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev

* commit '6dc2ac39e5913ceb5348d2e1e41af0ac95f59592':