tree af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93
parent 196c3c61c8e0ed433343cda5b51c19abd2982830
parent 6431f436f4dbcb1623e4643dab2dddd36122efd3
author Yorke Lee <yorkelee@google.com> 1398862210 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398862210 +0000

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

* commit '6431f436f4dbcb1623e4643dab2dddd36122efd3':