| commit | 0090082ed040dd3ea897cf13d7e837dadd06ca3f | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Apr 18 16:15:13 2014 -0700 |
| committer | Kenny Root <kroot@google.com> | Fri Apr 18 16:15:13 2014 -0700 |
| tree | ee0c94e70278a6ea7a8a21a718746408b5d2c77a | |
| parent | d5ed804f6fcbbdfb26da2289053e15802191aba8 [diff] | |
| parent | 89a086c16f669c5873b385bbadd2bcc9a0bf2a28 [diff] |
resolved conflicts for merge of 89a086c1 to klp-modular-dev Change-Id: Iaa82bfc87fb3af2e8e78597c6f2517e7dad7c130