| commit | 18126667b75bdf3dd9244c5eded86919de20c406 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Jul 27 09:22:56 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 27 09:22:56 2011 -0700 |
| tree | 6a633e74cd7648f1258d3d3613305c67a6ac744a | |
| parent | 777901424fa1100817f80a8cff8330b4b11d5af7 [diff] | |
| parent | 0cb2d467de28ae60a375404b08ae9a83aaa9305a [diff] |
am 0cb2d467: resolved conflicts for merge of 9363d912 to honeycomb-plus-aosp * commit '0cb2d467de28ae60a375404b08ae9a83aaa9305a':