tree d480a9df18213d791f716ded764bcd22e74dbd2d
parent 97bca3a87ac1c636abacd665c5aa611fe1fb764c
parent 63c36adba2ce1b03e05f3d4bf00077307f854038
author Yorke Lee <yorkelee@google.com> 1398819565 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398819565 +0000

am 63c36adb: (-s ours) am 62d5a16e: am 4e24159e: DO NOT MERGE Swap 9 patch for contact tiles

* commit '63c36adba2ce1b03e05f3d4bf00077307f854038':