| commit | ea5c0286e8a18e71608e6c6e5758b167fe0d6c26 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Jan 29 00:27:50 2015 -0800 |
| committer | Lajos Molnar <lajos@google.com> | Thu Jan 29 00:27:50 2015 -0800 |
| tree | 7c60a14509723c3bc7a54c0225e686fd8d14860d | |
| parent | 6dafb81dc699672f218915fa2895f8ee012203a9 [diff] | |
| parent | 44a2390bb707f2bc55265c43010f3cd092e233db [diff] |
resolved conflicts for merge of 44a2390b to lmp-mr1-dev-plus-aosp Change-Id: I39fdc2e8895e1e943749b9a2628656a8fa5bb72b