| commit | 792e2691276ffac5538e905b7fa8e9607b554283 | [log] [tgz] |
|---|---|---|
| author | Calin Juravle <calin@google.com> | Wed Oct 29 19:51:04 2014 +0000 |
| committer | Calin Juravle <calin@google.com> | Wed Oct 29 19:51:04 2014 +0000 |
| tree | 097cdcd41081d4afccc471fa93cfc13098642f84 | |
| parent | 7007477391d78c6f4823ef35490e67f75ddaced9 [diff] | |
| parent | 7a1abfe3b53c873a1e4ce9183d9b974f73ac1737 [diff] |
resolved conflicts for merge of 7a1abfe3 to lmp-mr1-dev-plus-aosp Change-Id: Ie5db9f745e01bd24faa317af0cd8874e1099ebdf