tree cef7e11b914e6e0d6063d1231e9376882aac14b1
parent c0b5c1c89798233c7b6113e7ac6e4c2887bd5656
parent 6e1e880f001ab3663fba3a7b6d292387efaf7b8f
author Robert Greenwalt <rgreenwalt@google.com> 1460410548 +0000
committer android-build-merger <android-build-merger@google.com> 1460410548 +0000

Merge "Add settings for SUW data control." into nyc-dev
am: 6e1e880

* commit '6e1e880f001ab3663fba3a7b6d292387efaf7b8f':
  Add settings for SUW data control.

Change-Id: I9a919ae9d8a960fa1540f051221643a5af3307c4