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