tree 10da860fcff71886af91d082e31f0e1917926848
parent 4a1061da709492430e12aefda865cb592e320538
parent 3e1897b3a73d1f2d5971620444dfff97e680ec85
author Dharmesh Mokani <mokani@google.com> 1422666507 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666507 +0000

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

* commit '3e1897b3a73d1f2d5971620444dfff97e680ec85':