tree daf5d686c95916674d1f8e3281f23d8d0735691e
parent b58e350e9266b8ced268b21900ab6c065dcac218
parent 4872e3df962a386576b51e03a26add0ceb700698
author Chris Tate <ctate@android.com> 1464900953 +0000
committer android-build-merger <android-build-merger@google.com> 1464900953 +0000

Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev am: 453951d077
am: 4872e3df96

* commit '4872e3df962a386576b51e03a26add0ceb700698':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Idabd2988d6b63e06a018c24c1b3a9e17514596b3