| commit | 69974972bec274bc6da6749707fe0c8ce2bc0c0d | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Sep 24 16:00:12 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Wed Sep 24 16:00:12 2014 -0700 |
| tree | f73fde8f1e524b80e774118296967f17ff1d1c10 | |
| parent | 7b11f62a348602ac20faaec8f4d3ab684abb93b4 [diff] | |
| parent | 64884bb1352bb76ee5fa55ac04743678bdf4b180 [diff] |
resolved conflicts for merge of 64884bb1 to lmp-mr1-dev-plus-aosp