OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 8 Oct 2010 22:42:10 +0000 (15:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 8 Oct 2010 22:42:10 +0000 (15:42 -0700)
commit8dc412c1c77904032e9028c18a3c3e16347a5f53
tree0606e8279199f08480811b978ac61970eac60cce
parentbc3776773c70d22fa1e85f215687ad16fad87b20
parentf419d5ef6167a8946d5e09da6f95aa84de76f105
merge from open-source master

Change-Id: Iaffa30e486413625ade78715268218fc9b9ac243