| commit | d2b940ed071dc3767d3c2f4f186ca3397cc34fd2 | [log] [tgz] |
|---|---|---|
| author | Marc Blank <mblank@google.com> | Thu Jun 02 10:43:11 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 02 10:43:11 2011 -0700 |
| tree | 35fc8c925f43c2345631d0ff767c5179a4a96291 | |
| parent | 74e51e26bfabad6a7e6afae3fb01ccdd259caa78 [diff] | |
| parent | eba97ec52f64aacb68fc58709256da646db111a7 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base