summaryrefslogtreecommitdiffstats
path: root/voip
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-10-21 09:47:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 09:47:27 -0700
commita294faffc90255fa17f9884a6e1749553d446deb (patch)
tree964515574493ada5ab695902e3ea75f317c8c01e /voip
parent749984798c64de1594ceb123d419711eed6e90a2 (diff)
parent6799864d6c9744e4c5133a90410576b577d65de6 (diff)
downloadframeworks_base-a294faffc90255fa17f9884a6e1749553d446deb.zip
frameworks_base-a294faffc90255fa17f9884a6e1749553d446deb.tar.gz
frameworks_base-a294faffc90255fa17f9884a6e1749553d446deb.tar.bz2
am 6799864d: am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread
Merge commit '6799864d6c9744e4c5133a90410576b577d65de6' * commit '6799864d6c9744e4c5133a90410576b577d65de6': Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
Diffstat (limited to 'voip')
0 files changed, 0 insertions, 0 deletions