| commit | 76c4b2a7b66d6220265ca08a70b0f9baa543a7f0 | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Fri Aug 19 11:27:31 2016 -0700 |
| committer | Sudheer Shanka <sudheersai@google.com> | Fri Aug 19 11:37:22 2016 -0700 |
| tree | 6085446af02244f294655308277a2785d0a300d9 | |
| parent | 4cf5241f47a48e4d84ed4786e4346ea93ef089a4 [diff] | |
| parent | 270947f78c77a7f5138f1d297c5d95327b30834b [diff] |
resolve merge conflicts of 270947f to klp-modular-dev Change-Id: I703a7f8eb0897e518c3df9e8c7efa19508611a47