aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-26 22:34:32 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-26 22:34:32 -0700
commit8eced4e305ad495aa85c3c0289508eab10319e4f (patch)
tree6361c2c6c31932ac127823d227fc33f55ce477c0
parent18a432587ceab8e49f9b6e83c2d06ba9e9124e04 (diff)
parent77918ad62923ebce31d75b1c028f7eef4248977a (diff)
downloadContactsProvider-8eced4e305ad495aa85c3c0289508eab10319e4f.tar.gz
[automerger skipped] Merge Coral/Flame into AOSP master
am: 77918ad629 -s ours am skip reason: change_id Ia3ddfe73a2fa32723e809f74bb83ff43d2c11df9 with SHA1 1d93206c5b is in history Change-Id: Ia6c3bcbc8f4eda652cbbaa81d9a8e1521ac1efa2
0 files changed, 0 insertions, 0 deletions