OSDN Git Service

Merge branch 'open_source' into google_internal
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 29 Mar 2009 15:55:20 +0000 (08:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 29 Mar 2009 15:55:20 +0000 (08:55 -0700)
commitb154320307bbde121af6effedda14fdfb625e4db
tree00ca291ce3f3a031f9035cad0e336aa4e93736ec
parent153b961cb6f206337a8a882fbf5c38b82662a9ed
parent8c32312983f8c3921c2097305205fbd407d1ab25
Merge branch 'open_source' into google_internal