commit | 41a3bdcbef9f9f762faf6abbe5f4a25f08febd92 | [log] [tgz] |
---|---|---|
author | JP Abgrall <jpa@google.com> | Wed Nov 09 21:51:10 2011 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 09 21:51:10 2011 +0000 |
tree | e20e884a0d1ca126e3836cdcec04ba2b5d19baa6 | |
parent | 941c6f7f71ba89ab8412908fed8e509c16c6a733 [diff] | |
parent | b4a96805d69b1f6281ece568b07927da2dd50872 [diff] |
am b4a96805: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp * commit 'b4a96805d69b1f6281ece568b07927da2dd50872':