OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Nov 2010 22:25:25 +0000 (14:25 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Nov 2010 22:25:25 +0000 (14:25 -0800)
commit8a9bcc0757cc054bc1a4a68f9077e52e8fbfacc3
treefeefec7e56403190613e36bb0c2464865514b6c3
parentf25d9fac87348504dc70ce7700da3a9fab3d928c
parent13d8e868bfdae8a4ed15059144e210d9e995c606
merge from open-source master

Change-Id: I0745cd709b0a481f12c29cf8858b51134a1265d7