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