| commit | a52b0988f27a0bfe88d38aee5133c25264913f68 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Mar 18 11:20:30 2015 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed Mar 18 11:20:30 2015 -0700 |
| tree | c6c28ccf7cd9479fc7b81843afd298931d8b6f73 | |
| parent | 61ecb53e73747b6400ba1cc2ffa2877c32a68fcd [diff] | |
| parent | c3f497ae7d841ea59da6e1ffc9c2c5237149173f [diff] |
resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp