commit | c3b3e0dad1787f476bfa235bc96c440f07042358 | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@android.com> | Wed Mar 07 17:05:06 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 07 17:05:06 2012 -0800 |
tree | dc3d462c230325309d6a6275ea4021c897e8e253 | |
parent | cd9bbc7a372129a0c45b53eb698c762e929e69a6 [diff] | |
parent | 09ec58ea0ff4a49c3c040cda7e5af8df3b040237 [diff] |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base