| commit | c638c6647d0a8e30b2e176e36b1c08ef57766f06 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Oct 09 15:17:23 2014 -0700 |
| committer | Paul Lawrence <paullawrence@google.com> | Thu Oct 09 15:17:23 2014 -0700 |
| tree | daad3535a3502bfd6c01516018f049e88d6b5994 | |
| parent | c7fb2ce7d3b9c5a324d8c8d07b339d69944a8ac0 [diff] | |
| parent | a49bfc0d2620a9ad95ddfa7ec61ce06a77066d97 [diff] |
resolved conflicts for merge of a49bfc0d to lmp-mr1-dev-plus-aosp Change-Id: I9ff777a6309aab2b5b18323dd4ee7617cb1c3180