| commit | 855ddb623137cf463d6a33e6114474218eee73a1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 13:43:54 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 13:43:54 2010 -0700 |
| tree | cf05783e4b8b76fa48d52ee024e98261623f0aed | |
| parent | fcb44c4e2fbb541d93ff4a2fd1393ceeb5ffd28c [diff] | |
| parent | 156b9f3d12db7c3680630bfded9483e1fbe5f467 [diff] |
am 156b9f3d: am 538e5778: merge from open-source master