tree 5243d4bee9d4700a7f4f148c168a9fd5fc765ba1
parent fb0696dddf972653b9b1acea38a13b5aa617abfa
parent 46644a831d966e3c19242d5131200fa068182b12
author Christine Chen <christinech@google.com> 1381959235 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381959235 -0700

am f235e985: am b6035973: Merge "Replaces Messaging app icon with default sms icon" into klp-dev

* commit 'f235e985515049c49bcb548c9094722b84bf8008':
  Replaces Messaging app icon with default sms icon