| commit | cb1610c82b3a715ab96da4bd697b0ed5cda21093 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Thu Sep 15 16:18:27 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 15 16:18:27 2011 -0700 |
| tree | b88b5b086319e94cb86e11f4d49d346d44b21048 | |
| parent | 68901a3e8157db32c02386415caf0ecc9ef47c03 [diff] | |
| parent | 1451f1821d4842ae9c5d3d4c6b5dab82048c0676 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base