| commit | de529e72b63c135053711ceb27a043f8d80e308c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 24 15:23:48 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue May 24 15:23:48 2016 -0700 |
| tree | 1ec3ff03468dafe996c9c51862da15934dbacfbe | |
| parent | ad431d2e2e15cc47b78fa62e4ab362bfdaa77070 [diff] | |
| parent | 7f5da85015cbf2aba62171d4139f5eb59ba7e36c [diff] |
resolve merge conflicts of 7f5da85 to lmp-dev Change-Id: I7a7547426a229ac99d187ec8bfabd49c4da51907