OSDN Git Service

Merge "Re-add the option to migrate data back." into oc-dev am: c660755348
authorDaniel Nishi <dhnishi@google.com>
Thu, 6 Apr 2017 23:17:15 +0000 (23:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Apr 2017 23:17:15 +0000 (23:17 +0000)
commita1edaff22cf2bd9c10c8d9c6c3c920180a612744
tree701261f1b29e25ea802d4df1d37017cad4794a6a
parent1949de3f1484ca2d44b47b81f841d0a767c94eb4
parent54cadd92d9a9dc488fab9ec1a4448f496ca303bf
Merge "Re-add the option to migrate data back." into oc-dev am: c660755348
am: 54cadd92d9  -s ours

Change-Id: I16223f007c500dca9fb723d306c337976ad579fa