| commit | 92f7e3e32d5dfd73238f18687a723231f2df088e | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Wed Feb 02 14:04:20 2011 -0800 |
| committer | Robert Ly <robertly@google.com> | Wed Feb 02 14:04:20 2011 -0800 |
| tree | 957967ca93cd09aaa03a41ad7719f195496065a4 | |
| parent | 8c4b273fb631ff8a3d5f5fae0ce9d444150921f6 [diff] | |
| parent | 3192a752d29aa6a0cf85762c5dcf2120ece1335f [diff] |
resolved conflicts for merge of f8cc65c4 to honeycomb-plus-aosp Change-Id: I407df4448a126a39128f3e24232c166be2625e14