tree a6433659518e98fc78ba26578042e4aa456f4469
parent cb7be1e8cd4e4388d014a5c48df455a5715f2180
parent 290efd244d8af18811b2ef2dac8f30cc7a37e066
author Christopher Ferris <cferris@google.com> 1414182017 -0700
committer Christopher Ferris <cferris@google.com> 1414182017 -0700

resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.

Change-Id: Ic6b18eeae43c2ef2256a0508ac60c1724385d3b0