| commit | d95fbc003932eb6791277f2ca4394eb021ede0fa | [log] [tgz] |
|---|---|---|
| author | Kevin Ma <kma@google.com> | Fri Jul 18 18:31:53 2014 -0700 |
| committer | Kevin Ma <kma@google.com> | Fri Jul 18 18:40:53 2014 -0700 |
| tree | 8d263f1cc0dda2a4ce572be91ee68f91ecd17986 | |
| parent | 867dfa01b40a770e333e60c4891cef02c2b38816 [diff] | |
| parent | c6e305c8c82191c61c5d8c0369d783630163e804 [diff] |
resolved conflicts for merge of c6e305c8 to lmp-dev Change-Id: I231e55e18f571fc8c30cca1485e63d8411813898