| commit | b59e5c70bfd04d904ccb9309a05618b6d5872968 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 07 08:04:34 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 07 08:04:34 2012 -0700 |
| tree | 527507a9c28588583b09bdd1395a2531a408e934 | |
| parent | 12f4e036139925bd5673861752ddafab57645cda [diff] | |
| parent | a057d5d0b095a5442923d0427d8792be0d59af54 [diff] |
resolved conflicts for merge of a057d5d0 to jb-dev-plus-aosp Change-Id: I16c9c3fa73b5b2f32e635ac053723053177cd6e9