| commit | 8a2f28a6295809d3f25e1a1a78cae9a932767e0b | [log] [tgz] |
|---|---|---|
| author | Tony Mak <tonymak@google.com> | Mon Dec 12 02:29:55 2016 +0000 |
| committer | Tony Mak <tonymak@google.com> | Mon Dec 12 02:35:42 2016 +0000 |
| tree | 87b4ae345151cd71068586005d9b78653f0327f6 | |
| parent | c04f8b9ecdb7a08e30fb04ee2acf5d44df64419a [diff] |
DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD This is a cherry-pick of ag/1640561. 1. Context.getActivityToken is not available in n mr2, passed the token from the activity to the controller instead. 2. Haven't pick the tests from master to mr2 branch because robotest is not set up in mr2 branch. Fix: 32959373 Change-Id: I2f73d01ab11e91b337beb90c05bbcb857dfd40dc