tree 95e89532ad5c4e0a4dadffa4a5968f1cd738707d
parent 0a6ff35a8b4f0d1a3258b723eb34576c6577cc1a
parent 9f548b00dcdd89e8d557223b8b99269ca7362c2e
author Ritesh Reddy <riteshr@google.com> 1449772722 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1449772722 +0000

Merge changes I2363e66a,If17effb9

* changes:
  Enabled NetworkPolicy backup and restore.
  Enabled SoftAP Configuration Backup