| commit | f4ade09627464c0220a3fc797471f2d14fcfa05a | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Oct 28 17:13:58 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue Oct 28 17:13:58 2014 -0700 |
| tree | a51ab1d4a826dd2620663596e60b55f747193524 | |
| parent | 187e3a05a2bc03e0316abed788d32dea47d77661 [diff] | |
| parent | 9a0b1a011f8f0ade82466db8b1e4e79818fb3c87 [diff] |
resolved conflicts for merge of 9a0b1a01 to lmp-mr1-dev-plus-aosp Change-Id: I323eaa8ab1dbaf1c78c1249b960dc6869e88db67