tree 1277544d3f6326a58a7ab5cd5c74eb44c8ef6319
parent 30a0031e4388a54890071e7c386b20c81509f27f
parent 8f5fc9e246e3ecebbb4cf4768da027e6e34d40d5
author Narayan Kamath <narayan@google.com> 1421952839 +0000
committer Narayan Kamath <narayan@google.com> 1421952839 +0000

resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp

Change-Id: Ie1587a4e2434b9cfbca16bc764e99e94511f8212