tree 87b0bea81fa6e24888c9e2c9560cf5659d9fcd51
parent 2421afccd19598577166d98162a6c40d3f9949c4
parent 48e9e20ebb8b5046643887c98a919868a8894205
author Anton Philippov <philippov@google.com> 1495640005 +0000
committer android-build-merger <android-build-merger@google.com> 1495640005 +0000

Merge "DO NOT MERGE [CTS] Add a test for key/value backup and restore." into nougat-cts-dev
am: 48e9e20ebb  -s ours

Change-Id: I0614c8baf7c8be4aced61b099938c1b517bb0ad6