commit | dec647262608225d06e03dd315ab66c281945cd0 | [log] [tgz] |
---|---|---|
author | Eric Erfanian <erfanian@google.com> | Tue Jul 10 18:21:10 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 10 18:21:10 2018 -0700 |
tree | d267f57bd3bcc26b85527a268422eb224eb0c221 | |
parent | 29a8ebdf5d34bb07b5290295fc2bffffcdd8c5f6 [diff] | |
parent | 4d6e1080533983791a47fcc22be38231d01692e4 [diff] |
Merge "Use ContactDisplayPreferencesStub when device is locked." am: 4d6e108053 Change-Id: I1f0dc099c476ddb2e8baa412434aac4c9662d1be