| commit | 9d9def1b182247d55e69eff1fe0ec1adfb0a5e01 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 19 10:57:48 2012 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 19 10:57:48 2012 -0800 |
| tree | 563344e1ba82d091aa26977c5b90ec066c43d01d | |
| parent | bf031a2586daccf2a47a66c7cc80ac050ba1c16a [diff] | |
| parent | 4749c6e3e2464a3f5c201e5f2ba16485d60702cd [diff] |
resolved conflicts for merge of 4749c6e3 to jb-mr1-dev-plus-aosp - do not merge Change-Id: I51fcb88d6b9f188a9c596031a2506eedc7150173