| commit | 040538693456b1975ab6184698e420a4d1c78e6e | [log] [tgz] |
|---|---|---|
| author | Christine Franks <christyfranks@google.com> | Sat Jan 21 05:42:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jan 21 05:42:11 2017 +0000 |
| tree | 8ef0ff602010e09395c5c7314f2b11c2149b3b4a | |
| parent | b196493856e096690cd3f3bb2dad00dca6dafdee [diff] | |
| parent | e1a7e67dc0d7ae4d4bf93b86b95e674495704bd3 [diff] |
Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev am: e1a7e67dc0 Change-Id: I3a337da003d504647d6ff7489d907754986e8482