| commit | 6add01406d2778c21c9ee18115f02d072485b9e3 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Thu Oct 30 16:21:45 2014 -0700 |
| committer | Ian Rogers <irogers@google.com> | Thu Oct 30 16:21:45 2014 -0700 |
| tree | cac19a9b38fa36df345e216bea2512a727a238f2 | |
| parent | 54f4f000c4a148e8605c067019d9a0dd5a8ab223 [diff] | |
| parent | f13e6d8243caaacba5f4b87a47e5b3d2d352b18c [diff] |
resolved conflicts for merge of f13e6d82 to lmp-mr1-dev-plus-aosp Change-Id: I98652b347a58a9c985ef8ded0c91fd5c36634487