| commit | 775dcaa1e04d4851ebba3032e1f05c951b91fbc9 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Sep 01 15:54:26 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 01 15:54:26 2010 -0700 |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf | |
| parent | 5eb874fa983ae1964d2171df79140d470b6e672c [diff] | |
| parent | 6b1bf60752166ca5b528b8c9786f3c381f0ade88 [diff] |
Merge "resolved conflicts for merge of 71c908c4 to master"