OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 4 Jan 2011 06:05:22 +0000 (22:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 4 Jan 2011 06:05:22 +0000 (22:05 -0800)
commitfba5bc867a565c9161e0ae25008b697a03ff0f66
treefa72c8ea74e7ecab95973440fb42ade1202dd24c
parent0d00d3e69ad8cd2497c2709845c43dd5fa4b2451
parent839f5f43d1ff326475ed9944fae4c68fe1065231
merge from open-source master

Change-Id: Idbc86de2d487d992b7a44e5831f539b520a8e9cb