| commit | e9265b771d72332d6021adc3a1333190ce5d103c | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 01 10:58:45 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 01 10:58:45 2011 -0800 |
| tree | 539d89ca8a1c9b515416402633c4f1e04738c7b9 | |
| parent | aabf253e34f574c35a661c59dedb6627618f4930 [diff] | |
| parent | f2ac085586186f1e1f30953253b5e360e979ac69 [diff] |
am 2d5ed079: (-s ours) am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread * commit '2d5ed07940bc1966d4b55999634f05515e7fe197': Merge 1911a6f7 into gingerbread. do not merge.