| commit | ad5e8696a33943d58bf8c67eb870b9d826c0b9fa | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Tue Oct 11 13:49:59 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 11 13:49:59 2011 -0700 |
| tree | ade6ea969d423cb59f09757a775c02b4e6acfa43 | |
| parent | 3829bc3c35750fed49b8700d84c7f6c0ec9e96af [diff] | |
| parent | 746a12ec9e0a35349f96dfbd890aeae92d571100 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base