OSDN Git Service

Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
authorJohn Reck <jreck@google.com>
Tue, 11 Oct 2011 20:49:59 +0000 (13:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Oct 2011 20:49:59 +0000 (13:49 -0700)

Trivial merge