| commit | 0191e7f6bea529e552ac637d9179a7359a37b78b | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Thu Oct 30 17:09:40 2014 -0700 |
| committer | Ian Rogers <irogers@google.com> | Thu Oct 30 17:09:40 2014 -0700 |
| tree | 8e20848f36c32d0fbb8b60c49febf2a618fd16df | |
| parent | 40cf9f9ea32c480635206670cceeb5b0d64b7bbd [diff] | |
| parent | abaf93c8f92de8b8d44173e78b0d7629b0324031 [diff] |
resolved conflicts for merge of abaf93c8 to lmp-mr1-dev-plus-aosp Change-Id: I03e67888f27204d461675fcb0af3c02291305d01