| commit | aa7caee5fdb077946d086a3fef22d5461fb5a996 | [log] [tgz] |
|---|---|---|
| author | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 02 12:57:10 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 02 12:57:10 2012 -0700 |
| tree | 34ab50b1d1d3cee1a7e1dc6fa1d248ead2bd1f47 | |
| parent | 57637f3a42725464aa5feb41216ea650d6e9f548 [diff] | |
| parent | 66e069e64ff9f81d3e2ad5f4347855aeb29f1efe [diff] |
am 66e069e6: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp * commit '66e069e64ff9f81d3e2ad5f4347855aeb29f1efe':