OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Fri, 19 Aug 2011 20:56:35 +0000 (13:56 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Fri, 19 Aug 2011 20:56:35 +0000 (13:56 -0700)
commit2bbfa0f9bd56edaa26acb4e66dd0669f8f694618
tree7010c9c0452378dda3d2d6159daae15b90552491
parent87438704105dae32bb1697d056fa59f3b1011e37
parent8169d1d82547a730b05b6ef03f1f7d3a1d3f947e
merge from open-source master

Change-Id: I8e6b7ae4ff179cc35c5de186f48e0551123247e3