| commit | eaf0f3d1fc7692131648024951d3396df73bb7af | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Fri Aug 01 14:55:58 2014 +0900 |
| committer | Ken Wakasa <kwakasa@google.com> | Fri Aug 01 14:55:58 2014 +0900 |
| tree | a9cf28f3d161d220c0f7c37028cb4829de0905ef | |
| parent | 6049a8a7538a778a9d67ef9483a2de2a8801c2b7 [diff] | |
| parent | 76880870ba8fbae8e37e6a8ba69666a7f162dd90 [diff] |
resolved conflicts for merge of d13b8822 to lmp-dev-plus-aosp Change-Id: I3f474f72ee12684cfda7b394d7aa659c7f456131