| commit | 241a381de596d6490c9c7ffeccdc7f28981d801d | [log] [tgz] |
|---|---|---|
| author | Eric Erfanian <erfanian@google.com> | Tue Jul 10 19:52:19 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 10 19:52:19 2018 -0700 |
| tree | d267f57bd3bcc26b85527a268422eb224eb0c221 | |
| parent | b2889529112d0fa921ca78451ae21be309ea533b [diff] | |
| parent | 2a20cb895df19ee0376201f230f9d88c8625968b [diff] |
Merge "Use ContactDisplayPreferencesStub when device is locked." am: 4d6e108053 am: dec6472626 am: 2a20cb895d Change-Id: I8622bea7b3d43fc2286b6a2ad8896bd8eedced7c