| commit | b4a96805d69b1f6281ece568b07927da2dd50872 | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Wed Nov 09 14:36:09 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 09 14:36:09 2011 +0000 |
| tree | f00db2e612adce63630532761e75476a85cdef6f | |
| parent | 8e2c51137cdd1917d36c3a78ff6c1a42cc8ea402 [diff] | |
| parent | bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad [diff] |
Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp