| commit | 4794db144381a28e2e6a304d9c12efecbe9ff86e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 31 16:48:56 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 31 16:48:56 2010 -0700 |
| tree | 92b7e24eee364ccde177ce06a1c9d403b06d7ba1 | |
| parent | 214e945749c952d14a8c3cd21a13c79e0b1f2ba2 [diff] | |
| parent | 078f38a3825b1071e84330f14986acb303bf5fa6 [diff] |
am 078f38a3: merge from open-source master