| commit | 3e08ca6709b5a75dc3b779cf3eba8196b08a0245 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Dec 11 11:17:51 2014 -0800 |
| committer | Lajos Molnar <lajos@google.com> | Thu Dec 11 11:17:51 2014 -0800 |
| tree | 0d91cba9d1c188d1898289f6b21826c6f6d316d3 | |
| parent | 2592184c976ef83aa9fdad7d63bfdb408c95aa7d [diff] | |
| parent | 6571ed31d9c967faacd552be238b41088ae11e25 [diff] |
resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37