OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Nov 2010 20:59:49 +0000 (13:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Nov 2010 20:59:49 +0000 (13:59 -0700)
commit80a5962d7b18f289fedebf168868b670ef3bf36b
tree131718c2ccbb049e2a58a96f9cfd75fec6bd38b7
parent2f3a5ed5aa4797931a1885c635c370ca14ef5260
parent10f5b52a88aa5188dd8edc99e6e2bff7d52d7a8e
merge from open-source master

Change-Id: I6e2470258fa36fadb41b5de4aa0156f272f34ad0