| commit | cd4ba20719f8313080ccc80798a2a07181ee0da2 | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Wed Sep 02 22:32:38 2015 -0700 |
| committer | Ian Pedowitz <ijpedowitz@google.com> | Wed Sep 02 22:32:38 2015 -0700 |
| tree | 14647d564ae8f7108c2c151d1b33974df9c68d4e | |
| parent | 60eca8d3d396de75fd31b48d42e7c1aaeba6341a [diff] | |
| parent | 3bcbf4037c34fec8bf6aa1a74bdb50b65d04af42 [diff] |
"resolved conflicts for merge of cd7d73fa to mnc-dr-dev-plus-aosp" Per chat with tomcherry, merge -s ours