| commit | 12d24b5aaba0752239401fc2c8b579e3b8ae97dd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 14:57:27 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 14:57:27 2012 -0700 |
| tree | 11684487d8812ff1df08db91d9bf49bb64adb383 | |
| parent | 82c11caca04bc4e14e0a33057f484635dc1ae8dc [diff] | |
| parent | 76af0657be461352ece41af3524cffc74261d21a [diff] |
resolved conflicts for merge of 76af0657 to jb-dev-plus-aosp Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d