| commit | e916313defbd09479dc29d38f3aa467f3b296f7c | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri Oct 24 13:20:17 2014 -0700 |
| committer | Christopher Ferris <cferris@google.com> | Fri Oct 24 13:20:17 2014 -0700 |
| tree | a6433659518e98fc78ba26578042e4aa456f4469 | |
| parent | cb7be1e8cd4e4388d014a5c48df455a5715f2180 [diff] | |
| parent | 290efd244d8af18811b2ef2dac8f30cc7a37e066 [diff] |
resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. Change-Id: Ic6b18eeae43c2ef2256a0508ac60c1724385d3b0