| commit | 3bc74967eaa0c79b08031a88bfb7da4089e24c38 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 15 12:01:26 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 15 12:01:26 2011 -0700 |
| tree | ac7000b02128e4726b21147aa7157e921efc4969 | |
| parent | fff6a88ccc6289ab31dfc7dc83bc35baef19dede [diff] | |
| parent | e8a00ad288e36204cab2ba2407b42525fe2e44e0 [diff] |
am e8a00ad2: (-s ours) am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread * commit 'e8a00ad288e36204cab2ba2407b42525fe2e44e0': Merge 6f2fb570 from honeycomb. do not merge.