| commit | c3e1770ff3b3fc6b76f518617bb9d12b16c04bb1 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 19 11:10:11 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 19 11:10:11 2010 -0800 |
| tree | ec7a4f1aa9bc8f4084eab0d4c9ac4250b4bfa734 | |
| parent | fb77461234f29f258a78062065fb5d2db9cc5610 [diff] | |
| parent | de8da848cddaa6515e28aa362cbbd987eb049615 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base