| commit | 63470fd0271143f88b92360312fd278a20e5765b | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Fri Aug 12 16:17:40 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 12 16:17:40 2011 -0700 |
| tree | 515ae1a9378416d64c84d8930be0bc148dc0a4e4 | |
| parent | 1e144548aa7c86af880264c7b4a4462e6c1a87c6 [diff] | |
| parent | be24f0c33114201f466ce8f001550bdc6910cf7f [diff] |
Merge "resolved conflicts for merge of d18dc005 to master"