| commit | 4cea01fa3b2185c3b398fbea9df576e42f500aec | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Wed Aug 13 13:24:24 2014 -0700 |
| committer | Tim Murray <timmurray@google.com> | Wed Aug 13 13:24:24 2014 -0700 |
| tree | 0b1efeb479a5cc4ecfce6a7add7163dd0dcfaa95 | |
| parent | a3ce6bbfc071f56e75ddfdd058baa077dd240833 [diff] | |
| parent | 2f2f77379d126ee51aec2c050e2692975a933418 [diff] |
resolved conflicts for merge of 2f2f7737 to lmp-dev-plus-aosp Change-Id: Idb5df78dabb0bc93505bb9a2f7cf5d7d0c1504d7