| commit | 3170581704fa59a8672262c0e6c68f455d470214 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Fri Oct 31 15:41:03 2014 -0700 |
| committer | Jesse Hall <jessehall@google.com> | Fri Oct 31 15:53:38 2014 -0700 |
| tree | 8dbf5884b6774cbf60cce9dce8d850d005d85a60 | |
| parent | bc11bbf2f0bd38c0f271cb95c138a48d5d9a085b [diff] | |
| parent | 04c9683aa1bb962bef3dce7f3cfd389a458133a2 [diff] |
resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp Change-Id: I83fdaf504ca37536c277a146c1d624e44cfe11b0