| commit | 5079856d43c7202303632d12eba91149a11c2bfd | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Apr 18 16:24:02 2014 -0700 |
| committer | Kenny Root <kroot@google.com> | Fri Apr 18 16:24:02 2014 -0700 |
| tree | c847ab22039de5ab8d8dd09ff5bd0f3a09114106 | |
| parent | 19745ce89add193c0e13c18979a3c9fb25bee475 [diff] | |
| parent | e897e2dcdafb0c633d0af05400d8e123018ad1d7 [diff] |
resolved conflicts for merge of e897e2dc to klp-modular-dev Change-Id: Ic367fd179fd402eadb4f3c5c0585ad9c17370002