| commit | 1bdade057133af3a93c35704b917c2a8e8cd0a9a | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Nov 20 11:04:43 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Thu Nov 20 11:04:43 2014 +0000 |
| tree | 09157f693489b945e0a9a6d873bd7e94a56c1e93 | |
| parent | 686c5be4722dce02ae8e5580d6677f1eeea22464 [diff] | |
| parent | fd5a3e06c24418ec1c6a7c0fa0183bb6328e91f2 [diff] |
resolved conflicts for merge of fd5a3e06 to lmp-mr1-dev-plus-aosp Change-Id: Ib4578fab76fdbb8deda016f065b60dcb172d3ad2