| commit | be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d | [log] [tgz] |
|---|---|---|
| author | repo sync <aalbert@google.com> | Thu Feb 24 09:58:25 2011 -0800 |
| committer | repo sync <aalbert@google.com> | Thu Feb 24 09:58:25 2011 -0800 |
| tree | 1c35523a8df3b87d1b7c6d8f1efb1c18f8d6910c | |
| parent | 22577b8d3a39c1373594ba3e4427212eee4cd6d4 [diff] | |
| parent | c96b669013a790c84e63e28257ab4ca07306e73c [diff] |
resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4