summaryrefslogtreecommitdiffstats
path: root/libs/hwui/TextDropShadowCache.h
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-10-11 17:49:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-11 17:49:42 -0700
commit02241ab2929c34aa48acdf4befcc9cacd86c1a6f (patch)
treed8c5accddfb06cf620d40deb095aee851b118d73 /libs/hwui/TextDropShadowCache.h
parent76f8688e9b9a71cb064119022a3f69c2e17b8b65 (diff)
parent89fbcd72fbe6ef26ea2703f8e338fd198c958ecc (diff)
downloadframeworks_base-02241ab2929c34aa48acdf4befcc9cacd86c1a6f.zip
frameworks_base-02241ab2929c34aa48acdf4befcc9cacd86c1a6f.tar.gz
frameworks_base-02241ab2929c34aa48acdf4befcc9cacd86c1a6f.tar.bz2
am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc' * commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc': Support showing "Cold" battery health.
Diffstat (limited to 'libs/hwui/TextDropShadowCache.h')
0 files changed, 0 insertions, 0 deletions