| commit | ece13f90ed7d5cd4d025af34a6651cd32c2cbaf3 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 19 15:37:15 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Fri Sep 19 15:37:15 2014 -0700 |
| tree | 754b84e4f50c2ae93d3f874bc07b7ee3438eb775 | |
| parent | c058fbb5a0a4c9ba4951a07bf2786e0f41453be7 [diff] | |
| parent | 8791ebf0cd6475770be25459df669fe5da99ebe1 [diff] |
resolved conflicts for merge of 8791ebf0 to lmp-dev-plus-aosp Change-Id: I9d0f81003f84d03a7a67420dd496fde18dd654d4