commit | f844a5a456957456dd0c4f6ed8f12b61357dda6d | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Tue Jan 19 16:35:00 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 19 16:35:00 2010 -0800 |
tree | 4d969c2c35b93a781784837d643456de6745c4d3 | |
parent | ef5506c817c2a305ca1c7b03d4ea34a64962b9d7 [diff] | |
parent | 77872f76a12c883c163a70a42e347f35c4e9a269 [diff] |
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base