OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Oct 2010 18:06:50 +0000 (11:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Oct 2010 18:06:50 +0000 (11:06 -0700)
commitc745347efe3e50623f744d5e422a71ab8bff3a5e
tree585a33c3cf493069cda772f542d46aa4546e46e9
parent4b0617ae2e2ad5ec9f9d6e202f6d1ed45aeecf77
parent2e6974a8a1d331536d2aadd807a3b127600818b2
merge from open-source master

Change-Id: I1e69603b2d46eb071822dc7fac667bb02649e15a