| commit | 6c24e0bb807a214cd3fa1b42cc1d577ad5952ad8 | [log] [tgz] |
|---|---|---|
| author | Ross Yeh <rossyeh@google.com> | Fri May 11 20:36:32 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 11 20:36:32 2018 -0700 |
| tree | fe434bff1d06a33284a72595765a7c23f42117a7 | |
| parent | 5fed1841e17a7d800bfd09a7d1ee7a80378bacb5 [diff] | |
| parent | ab33f6c385cc2c3a9c36a41371943e3905b410bb [diff] |
[automerger skipped] Merge "[automerger skipped] Merge "DO NOT MERGE [CTS] Add a test for key/value backup and restore." into marshmallow-cts-dev am: 4726bd9837 -s ours" into nougat-cts-dev am: f4832c94a3 -s ours skipped: 49a19f9fd6 skipped: 12a7db1965 skipped: ac162e7e36 am: 74e3e3d749 am: e4b664f185 am: ab33f6c385 -s ours Change-Id: Ibc476179b50aff1293918ce15b64a7a6156bc990