| commit | 46246e5b1725a8a1868dbd9f37fffe33c19672fc | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Jan 29 00:39:06 2015 -0800 |
| committer | Lajos Molnar <lajos@google.com> | Thu Jan 29 00:39:06 2015 -0800 |
| tree | f6f882212bd117b4b910fc0c2988cd964f3a80d2 | |
| parent | 9c8bce57d37e36f473499f064e787e6ba7fed4ed [diff] | |
| parent | 59d1d0100e56bc6749c2eccf3b4b06904084944c [diff] |
resolved conflicts for merge of 59d1d010 to lmp-mr1-dev-plus-aosp Change-Id: I52e17685b3aa058d6c6b0c023659231fa00a8f71