OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 13 Nov 2010 03:16:34 +0000 (19:16 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 13 Nov 2010 03:16:34 +0000 (19:16 -0800)
commite858e87cfba9bc25b42170b5a484a36fe72b388c
tree04e5beb68a01abc0a283efdaccbdfd5effc0b8c5
parentd9f75383939ac93c58eb1b365328222a6c970d20
parent09324606fa602d352271004655d1020df29c2a59
merge from open-source master

Change-Id: I77c39ab13953b383641720fd44cc4958e45460e0