tree 23223c507a4fcc0d36459e79ee3bb16c3b26fc34
parent 68c2bda102b5ea7bcd97d6119e77efd046d4b4af
parent b6b0c4702d79a08474dcbff80a77eb17b722703b
author Mahaver Chopra <mahaver@google.com> 1455231796 +0000
committer android-build-merger <android-build-merger@google.com> 1455231796 +0000

Merge "Updated RestrictedSwitchPreference" into nyc-dev am: 87e4a8a9d2
am: b6b0c4702d

* commit 'b6b0c4702d79a08474dcbff80a77eb17b722703b':
  Updated RestrictedSwitchPreference