| commit | 3bacd1aeee5bea9617a2a6fc262d8b8105427e80 | [log] [tgz] |
|---|---|---|
| author | Ross Yeh <rossyeh@google.com> | Fri May 11 17:09:40 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 11 17:09:40 2018 -0700 |
| tree | 7c99c2923d1ffbd9cef760f9797bd4a28224b81c | |
| parent | 1958dc3197c377751925a5dc128d16967905abda [diff] | |
| parent | 2cd1304583f67a78d3b85af7bd25e8832625f9d0 [diff] |
[automerger skipped] Merge "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" into nougat-mr1-cts-dev am: 0955 skipped: 45a7611ae1 am: 2cd1304583 Change-Id: I8990f09d61f8f00144ce36b90421d425c480ae59