| commit | 5b988318a8f00f24c9de2a0933f592ab3ecb625b | [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 | 351f1daa6aa1b75c6f3579dbd758a51e2d22ef32 | |
| parent | 2b9a92a80bdb2795930d89a80b9ec19c9ca29719 [diff] | |
| parent | ee9c3dbdd04a73d867a1358a8e50848c40d0153f [diff] |
Merge "resolved conflicts for merge of 71c908c4 to master"