OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Nov 2010 00:38:08 +0000 (16:38 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Nov 2010 00:38:08 +0000 (16:38 -0800)
commitffe9bc68c245fe23c21a54b3c222d5c69256dccc
treedf9f26faad366345afa7f0e3567cbc75be966d46
parent8b9a6e6442b9cc7ab2eb3c5428d8f18a250e63ea
parentac65eedb55f42baaea04a1493060596bcd507636
merge from open-source master

Change-Id: Idf12fbcb5508ca53047fcde3c35a96f9a971d305