commit | 4ac3585263ad59def5cf14756347cecab43e6e67 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 09:44:36 2010 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 09:44:36 2010 -0700 |
tree | 89ed91b26ca3e58f51278c0c58e77f56f1a766d8 | |
parent | a945bfd91aa291fba4d9201ffcb38fce40eab7fe [diff] | |
parent | 49475772e0d3c38ab1246deac3d5e5bc6c2bb4e6 [diff] |
merge from open-source master Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4