| commit | c50a67b3965a1ed9ffbee4dae736590a167876f5 | [log] [tgz] |
|---|---|---|
| author | Jaikumar Ganesh <jaikumar@google.com> | Thu Oct 14 09:43:00 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 14 09:43:00 2010 -0700 |
| tree | 2d3b230eee1a9645c8f2c93e5e32e3ea906d9b20 | |
| parent | 838c6a15783b3ca9adc1ab49b25043ee272f63de [diff] | |
| parent | aa4b235dd720d1f2861681cdfabf3b5fabc61fb0 [diff] |
Merge "resolved conflicts for merge of 79a5307a to master"