OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Mon, 8 Aug 2011 17:59:05 +0000 (10:59 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Mon, 8 Aug 2011 17:59:05 +0000 (10:59 -0700)
commitf02718db30f5550847fccc3b1711193bfc09ff2c
treec65b4ec59d9d45552ce14e8bacc63a473612aa02
parent33f24e7b63625764837729377913754c44d1efd5
parent853b74b8fa52bdebef8a26b6bb9fd6d9caafa4ea
merge from open-source master

Change-Id: Iee36c92ed11abb8dbc72851986a1d4a3f33d8c33