commit | baf8711684885fdc242c44903200ca6904fa5c46 | [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 | fa847682db64a599ab228195ba8be832affe8d87 | |
parent | c351ab473400ff15e53c33ab57cf8286c4bfad7a [diff] | |
parent | 79425fd600e521f1eb4947c26ef631d3e1d29920 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base