tree c028bfe537607823c37e2ffc8c713c73059d3130
parent d63a460e4b87f014f71e8cfbb474f4969e0a6b01
parent c7eb68d38b1a013dc8820b16d251019e8ba989bd
author Dharmesh Mokani <mokani@google.com> 1422685339 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685339 +0000

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

* commit 'c7eb68d38b1a013dc8820b16d251019e8ba989bd':