| commit | 7ba11ef4a00a98068a16b8d75600886ee4a910cc | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Nov 30 09:55:47 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 30 09:55:47 2011 -0800 |
| tree | bbdad886e8ebaa4f848a859c5b158f01e2f4ea86 | |
| parent | cdc8a01e26d538e9fcc4e7c4dac86e30b76d70a1 [diff] | |
| parent | db85b54395c2866f07178558079cbc1813ff420c [diff] |
Merge "resolved conflicts for merge of 3d630e86 to master"