Merge branch 'open_source_no_contributions' into google_internal
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 29 Mar 2009 15:55:07 +0000 (08:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 29 Mar 2009 15:55:07 +0000 (08:55 -0700)
commit9488347a7f0a1e2c41290fce6c577740a9774a6d
tree39b5ea8fb392b6983dea27f96343bd7e891785be
parenta89495f48f185779ff7d9d64ce6e6b037c9ded87
parent517a0e86cbbc677bfc3dfa9b373a12a9f7b8ebb2
Merge branch 'open_source_no_contributions' into google_internal