| commit | 9b4f85d31e06663ec8f7b4da334ed5eddcd3a415 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Tue Sep 16 10:51:50 2014 -0700 |
| committer | Ian Rogers <irogers@google.com> | Tue Sep 16 10:51:50 2014 -0700 |
| tree | 3a5ddb5340d9955a51b6cccccdc5943503e8a49f | |
| parent | 6fba30fc989ccae06d28b6bbd7d4c5621346d589 [diff] | |
| parent | b93c54528eee1d29d99ca537486311137a910360 [diff] |
resolved conflicts for merge of b93c5452 to lmp-dev-plus-aosp Change-Id: I2b343a2b3ae26d38f1ece17e2999a5b1089e0dd6