commit | c82f4cc748a2697342cc63a5f9da957a7f9e4eb4 | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Mon Nov 16 14:40:16 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 16 14:40:16 2009 -0800 |
tree | e2e2c9373e1574919bef48cedabf9c266423935a | |
parent | 1a5eef2169a08bc0b32fa807703ddb324abc929b [diff] | |
parent | 12814547b828bfd9d6a632bbc6c699afd5c4cbce [diff] |
am 12814547: resolved conflicts for merge of 607b9c37 to eclair-mr2-plus-aosp Merge commit '12814547b828bfd9d6a632bbc6c699afd5c4cbce' * commit '12814547b828bfd9d6a632bbc6c699afd5c4cbce': Fix 2209086: Add animations and misc ui improvements to SlidingTab.