OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Oct 2010 18:55:34 +0000 (11:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Oct 2010 18:55:34 +0000 (11:55 -0700)
commit8358938a4101f48942285c7e9310878cf539bdc9
tree881d1f9a35e2a40b15c8146f3058b00dcc490680
parent837e886216e3b422488e35dead4bc8093e6089fd
parent63b94cf297b3c7343bc56cad470ad1614e76db4c
merge from open-source master

Change-Id: Ib0241b6df43dae934d59089ff60fbf4125d4f6e1