| commit | 7655a979846db6be2df803d76ec6602cea3f738e | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Sep 24 09:42:39 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Wed Sep 24 09:42:39 2014 -0700 |
| tree | ed59aa8cfed33edecedc2addce513bb529f4e138 | |
| parent | f811b82b4d28bddde54c42b8771df47b5ee520b7 [diff] | |
| parent | 326f9450f03d24d49e77697547c3373370e7eb2b [diff] |
resolved conflicts for merge of 326f9450 to lmp-dev-plus-aosp Change-Id: I66360da623a6e7ac04610c3252f24ed69f7e4b1e