summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-10-26 18:20:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-26 18:20:14 -0700
commit3e066d43323ce0b9ccf44ea37373dd1979656261 (patch)
tree17f0c21f5d161ba4406c8d25753119c5b87cc996
parentc3f3f016c4c98666509aaca92e3035209e028362 (diff)
parent0750903ecc110dcbb08288d435b69c4ea3861b6a (diff)
downloadframeworks_base-3e066d43323ce0b9ccf44ea37373dd1979656261.zip
frameworks_base-3e066d43323ce0b9ccf44ea37373dd1979656261.tar.gz
frameworks_base-3e066d43323ce0b9ccf44ea37373dd1979656261.tar.bz2
am 0750903e: am 9eec7bb6: am 17d237e1: am cc0106cd: Merge "Properly show emoji in the notification ticker." into jb-mr1-dev
* commit '0750903ecc110dcbb08288d435b69c4ea3861b6a':
0 files changed, 0 insertions, 0 deletions