| commit | 72b82fa00dbfe5b3aaf937fda3d8ef272095dbfc | [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 | 25df278b1f8f64a500051ecff2e9972ac17ba0f7 [diff] | |
| parent | cd7d73faf64cc8d592da3a7275b899dd90601338 [diff] |
"resolved conflicts for merge of cd7d73fa to mnc-dr-dev-plus-aosp" Per chat with tomcherry, merge -s ours