summaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2018-07-10 19:11:03 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-07-10 19:11:03 -0700
commit2a20cb895df19ee0376201f230f9d88c8625968b (patch)
treed267f57bd3bcc26b85527a268422eb224eb0c221 /assets
parent328b849f2389ddd6da527c8fa3a93dfbfccba217 (diff)
parentdec647262608225d06e03dd315ab66c281945cd0 (diff)
Merge "Use ContactDisplayPreferencesStub when device is locked." am: 4d6e108053
am: dec6472626 Change-Id: I4cc0df6ff40c90c587cc5111f5f4e1d8ad5d4d0f
Diffstat (limited to 'assets')
0 files changed, 0 insertions, 0 deletions