| commit | 2765c0b71679b5762ed72610e8310abd6d071b96 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Tue Sep 17 19:17:12 2013 -0700 |
| committer | Chris Craik <ccraik@google.com> | Tue Sep 17 19:17:12 2013 -0700 |
| tree | e30f430930366ef5be5688c1b6a0a1adbf2984d2 | |
| parent | e08e6632294143f889ab68f0c3453ee6802dc60e [diff] | |
| parent | d97303a73babf8f820a78f72d558be8e4ad09f47 [diff] |
resolved conflicts for merge of d97303a7 to master Change-Id: I29e2e64e0ec241675762482cbe5c5e9dc58adca6