summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2010-10-12 11:23:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-12 11:23:12 -0700
commit00c50b2e49dbb3537a3ee553dc79d6e34cd00065 (patch)
tree12c2cfb365b55c8e737892790cfa2634cbc13c1c /native
parent4711d21a55d9ff6f234d3b06ff2d07dca19238fc (diff)
parentf348502c70ae2f3c90bf75d8c4b4402d5e8e4d59 (diff)
downloadframeworks_base-00c50b2e49dbb3537a3ee553dc79d6e34cd00065.zip
frameworks_base-00c50b2e49dbb3537a3ee553dc79d6e34cd00065.tar.gz
frameworks_base-00c50b2e49dbb3537a3ee553dc79d6e34cd00065.tar.bz2
am f348502c: Merge "Allow TextView to do its thing." into gingerbread
Merge commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59' into gingerbread-plus-aosp * commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59': Allow TextView to do its thing.
Diffstat (limited to 'native')
0 files changed, 0 insertions, 0 deletions