OSDN Git Service

Merge \"Merge \\\"Fix adb backup/restore\\\" into nyc-dev am: 45c79447ad am: c5202cac...
authorChristopher Tate <ctate@google.com>
Wed, 22 Jun 2016 23:16:36 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 23:16:36 +0000 (23:16 +0000)
am: ac8a04c06f

Change-Id: I0c0b43d2b223c363abaa57819789dd35940d0ab7


Trivial merge