OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Fri, 12 Aug 2011 23:03:27 +0000 (16:03 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Fri, 12 Aug 2011 23:03:27 +0000 (16:03 -0700)
commit105add1d07fcb9b872dbdda4ff07b824bc20b623
tree737c0330374c74285a1332ba191cc019ebb70109
parentc53c81deeb864e035053436af96b4e428077a370
parent4ce1938fae83a4009d11241ecd2afbdcb1cdb440
merge from open-source master

Change-Id: Ibc34d3f1606d563a04c9bc069b7fc617d0268989