OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 13 Sep 2010 18:49:36 +0000 (11:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 13 Sep 2010 18:49:36 +0000 (11:49 -0700)
commit98f286462fe20248f11c24031c1fa5ac19931db5
tree5917ce8144a7b1456b2d0bd0fdc1762adbb907ef
parent1a7049afbd131c93edc1af5caf835d689054c3ea
parentdf9ec36094bed53ff18dd389cf7b6ce86efc50a6
merge from open-source master

Change-Id: I0eeb8079983f90e5f29988c8365ca7bf3fe45ee0