| commit | fa0adc72d6fd9afe048c4c3e9cf95e6fd824f903 | [log] [tgz] |
|---|---|---|
| author | repo sync <chiachi@android.com> | Fri Sep 03 00:24:26 2010 +0800 |
| committer | repo sync <chiachi@android.com> | Fri Sep 03 00:24:26 2010 +0800 |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf | |
| parent | 90aa8ffda1ec6fcdd9413dc1e06091e64c431a76 [diff] | |
| parent | d764bb7a4b3d7841dbe860818444bfc4d35742a1 [diff] |
resolved conflicts for merge of 12eaf9d5 to master Change-Id: Icb706bdf350a9c471070fa3e2296cde77ef3703d