OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 04:02:58 +0000 (21:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 04:02:58 +0000 (21:02 -0700)
commit7433e3c310df4c19ccc2aee3b016b432bad7e735
tree982a1c71df35afb7bb5727d94dc8a232119a2303
parent61275735d59674ddd863e44635b82324bb7c6a8a
parent38a12395d47576c19e3bb40f11f473ec22815e11
merge from open-source master

Change-Id: Ieb44492164256a2f01a8a7062b5cf868398b5ddf