tree 891f1ad1d7c74e1821a4d76d6c0842e71a86f92e
parent b13e01cb093c31c2a95aa183fa48ee4a595e4b66
parent 17d04931ef8a0218a2e4cda8b1a32d04d3ca181e
author Anton Philippov <philippov@google.com> 1495642872 +0000
committer android-build-merger <android-build-merger@google.com> 1495642872 +0000

Merge "DO NOT MERGE [CTS] Add a test for key/value backup and restore." into nougat-cts-dev am: 48e9e20ebb  -s ours am: a01b2e96f5 am: c435e8a0ef  -s ours am: a9e25f9f6b am: 7d2d9be712 am: 848e08a5a2  -s ours am: 26fba233fb
am: 17d04931ef

Change-Id: I890125a474522a8be00bb9219c6f853bd6fb2b54