tree fe06a09b2ffe3756a9787b24793c88c5e164645f
parent 47337a893f6cf8f07ef60e706910c9f2b440e906
parent 6fcb800170753cab53cf7ae6357c900a1fa77146
author Wenyi Wang <wenyiw@google.com> 1479516004 +0000
committer android-build-merger <android-build-merger@google.com> 1479516004 +0000

Merge "DO NOT MERGE Update AOSP contacts to 1.6.13 Bug: 31101408" into ub-contactsdialer-h-dev
am: 6fcb800170  -s ours

Change-Id: Ia15df5b17f348d272ba70ff4edc07ee0257fe255