OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Thu, 11 Aug 2011 19:29:37 +0000 (12:29 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Thu, 11 Aug 2011 19:29:37 +0000 (12:29 -0700)
commit9663b79e7f90d1d6f594ea17e618951c5af34531
tree70e660b366b9fe6d8c542ff067e7ea071106d4c9
parent0e4fac49957d477ed90f290b4e108d449f8ffe02
parent8b7e1b8e01a90c08b94880aa0ddc68135593a309
merge from open-source master

Change-Id: I6e877e927d9df8177abfbfebaa64a87d272ed83b