tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent ba45d39a0c9d540e1e8e756b5eef9d4b60f01aa8
parent 32c210b7eeb8c3fb6699b9ac1e10b888227de1d5
author Dharmesh Mokani <mokani@google.com> 1422669714 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669714 +0000

am 32c210b7: am 3e1897b3: am f9847b9b: Launcher change corresponding to platform change.

* commit '32c210b7eeb8c3fb6699b9ac1e10b888227de1d5':