| commit | 61ecb53e73747b6400ba1cc2ffa2877c32a68fcd | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Mar 18 10:26:11 2015 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed Mar 18 10:26:11 2015 -0700 |
| tree | c6c28ccf7cd9479fc7b81843afd298931d8b6f73 | |
| parent | 3b419c0f5c870960b11c9fde81e9eb8ea8976aad [diff] | |
| parent | fb9ff42d7401d0a2c58140fe306460852ea51167 [diff] |
resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp Change-Id: Ifff03303c62aeba576974b877988b3a479945aa2