OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 28 Aug 2010 02:14:41 +0000 (19:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 28 Aug 2010 02:14:41 +0000 (19:14 -0700)
commitabaaf1333140ab0421b0e722aa24fff4647f27d1
treea360cb0053675e7b0c607058c3be633e0ffc3935
parentc82ed6b09f3c419adf24185ad43ae125b7e30b93
parent4f8210d3919dccbd334a45bab813087af5773016
merge from open-source master

Change-Id: I45a9ed955c76132d3bf955192686a28ce3c152b1