tree cd6b8887f5bb7a2c9257b06ab8c825a118b64e99
parent d06fa51e6b974aca0e35e2dc3b693c6a6628dfc5
parent 2893302afc4137e63c9174a5d471d1f18b8b5d87
author Sudheer Shanka <sudheersai@google.com> 1457999472 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457999473 +0000

Merge "Call preference.setEnabled only after updating disabledByAdmin state." into nyc-dev