| commit | c5b47cff8891429f4f5cf9d6026cc2f8cfe8fcc5 | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Mon Nov 12 10:07:09 2012 -0800 |
| committer | Katie McCormick <kmccormick@google.com> | Mon Nov 12 10:07:09 2012 -0800 |
| tree | 2257f7ac74a582b2cdc3b7665d9b94561a897848 | |
| parent | 4c0fc03b5ed396d19035ee6a77a70189a0fba31a [diff] | |
| parent | 7f9a053580965c740a87dcfa75d77afe7faa5e56 [diff] |
resolved conflicts for merge of 7f9a0535 to jb-mr1-dev Change-Id: I8aee63b128a833ff8c2aaf2167850815033766dd