OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Sat, 6 Aug 2011 04:38:22 +0000 (21:38 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Sat, 6 Aug 2011 04:38:22 +0000 (21:38 -0700)
commita601af22ab3879fb64d874167c312e255300bb99
tree97170f4b89b90a10ae0cbbb6fcc0db948860ccee
parent2cbd8392875afa8c25ddef636dbf27b73313d402
parent65bf8b5ce85ee7df2f0027e20d86caebc46bc4a9
merge from open-source master

Change-Id: Ib84e1d8c17c3763abf852b527baad5c59a3e6399