tree aff4c0838424cb818cee167e7aea5cf4d0319105
parent aaaa236cec53f42963007c46b5d119ce9c6b03c8
parent e6f635ff823499203ef8ab4c01de07ea0eb33ad9
author Doris Ling <dling@google.com> 1465421719 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1465421720 +0000

Merge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev