OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Mon, 15 Aug 2011 15:14:53 +0000 (08:14 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Mon, 15 Aug 2011 15:14:53 +0000 (08:14 -0700)
commit23d4697ea9afce013ffbde03a7a7a403e74afd31
treeae814f1c3c10e953009bf96203b14aaa4bdba26c
parent92dcb3cf39d3d0547494396243eb47261b493eb8
parente3a869ad43f272c7804ad8cacb5bf4e9f00e2328
merge from open-source master

Change-Id: I4ae9090396b8297e027a092da2825d96a9782a8e