commit | ce88086cc425b33e0c389dc9a233e5a72acf6833 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:45:20 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 13:45:20 2010 -0700 |
tree | 4362f0605621de51d9e4e38a8746b9bdc49ebd5a | |
parent | 876ae91cc53fb389a0b4cb60bb5ab4430b985395 [diff] | |
parent | 105a934f3b1ce254c5db7c6740ea7c2bca6d2ea3 [diff] |
am 105a934f: am 9514fca5: merge from open-source master