| commit | b43af8807f5420d9f4abc62f40f5fd8780fd9932 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Sep 24 09:51:05 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Wed Sep 24 09:51:05 2014 -0700 |
| tree | ed59aa8cfed33edecedc2addce513bb529f4e138 | |
| parent | c679451484b9450f53bbef4ec0cb3de64671f974 [diff] | |
| parent | 326f9450f03d24d49e77697547c3373370e7eb2b [diff] |
resolved conflicts for merge of 326f9450 to lmp-mr1-dev-plus-aosp Change-Id: I10e578a3d10a03312cbc4058a92f02ccaba1739c