OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Nov 2010 18:45:58 +0000 (10:45 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Nov 2010 18:45:58 +0000 (10:45 -0800)
commite19de6ee42b86f7a07591541e10c7295e219b614
treecdc061a77ac026bb685875f9db42eb7bfe35dec2
parentb98c82eade788a959efee16d596a1a2e87158d01
parent4db3692678ec4b2367c36bc2abeaa5f58776345a
merge from open-source master

Change-Id: I7f45f71c41479346fe109b0a71ee1f7549d3ceda