tree 0668c5d92eaaf97adb667b399862f873f0d78701
parent 04c4b5ea9f5aecfdb4b68025ae8c9e34e12c70dc
parent 57ec13b298d579bd9a39c82e7c8ac44fe4d6a2f0
author Elliott Hughes <enh@google.com> 1412375372 -0700
committer Elliott Hughes <enh@google.com> 1412375372 -0700

resolved conflicts for merge of 57ec13b2 to lmp-mr1-dev-plus-aosp

Change-Id: I79418b166b9efbc2ca028a05ec04e5a7fd667ee6