| commit | 3d535d29496d10b5528d0c5a228d1d798e00735a | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Tue Oct 05 12:26:22 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 05 12:26:22 2010 -0700 |
| tree | 4e3de6c3918e979728dc9695c0554cb66c1fdb0a | |
| parent | f6904c4bb4f0994f2b569515cafa426681f4100b [diff] | |
| parent | ff3c191d2a8a71f2b63386a8623a584b06416ab2 [diff] |
Merge "resolved conflicts for merge of 8390651c to master"