tree 032a162a2248b2fc0be232afc9b9666747a1e5dd
parent ceb670cfc09e407a30627d5044f45d5e28e1be5d
parent 86125acacd0f06f8523917e6d94e8cd3d7a4aca2
author Elliott Hughes <enh@google.com> 1376010513 -0700
committer Elliott Hughes <enh@google.com> 1376010513 -0700

resolved conflicts for merge of 86125aca to klp-dev

Change-Id: I78622ecbad27301b285193a085fa04374aa60033