| commit | 138996f88b29ca31fadb1be4337b260e94af1338 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 26 13:51:33 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Fri Sep 26 13:51:33 2014 -0700 |
| tree | 83a1e965b42f61146c366139e32cf7c11b2fd45d | |
| parent | 8df564e55201ea56bea9da4587c0d25f5ecf90ba [diff] | |
| parent | efd44c45f6f9cd3eb1735d6b798d2cc7913eb515 [diff] |
resolved conflicts for merge of efd44c45 to lmp-mr1-dev-plus-aosp Change-Id: Ib56d9c6a7696be05ca6b62f017319e8a96d656aa