summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiwen Zhao <zhao@google.com>2014-02-15 00:27:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-15 00:27:31 +0000
commit7c22c9689c712a157f8787fdf97ccc815ee8332e (patch)
treec3f7b6bda200951ea4adfdde8bd41a58bcf2664a
parent63904d678a8884e15bd4740e0e526fa5ef6ae31a (diff)
parent76fd2e70bd28668a09edd1e7bb30348b6536b5ad (diff)
downloadandroid_packages_apps_Trebuchet-7c22c9689c712a157f8787fdf97ccc815ee8332e.tar.gz
android_packages_apps_Trebuchet-7c22c9689c712a157f8787fdf97ccc815ee8332e.tar.bz2
android_packages_apps_Trebuchet-7c22c9689c712a157f8787fdf97ccc815ee8332e.zip
am 76fd2e70: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/a/platform/packages/apps/Launcher3 into klp-dev-plus-aosp
* commit '76fd2e70bd28668a09edd1e7bb30348b6536b5ad':
0 files changed, 0 insertions, 0 deletions