| commit | 1d8b34ecbb97063db49ae2f55a91f44fbafbb1f2 | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Fri Aug 20 06:27:27 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 20 06:27:27 2010 -0700 |
| tree | 7cb9f3f09ae718ca0c0b8933c6bad0b2b43b1237 | |
| parent | a2c1583eacec13696449038f3b29cf0191f6d0e3 [diff] | |
| parent | cf6f0d58a8444427a5aea372af86fca89386f987 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base