tree 896866e44a3711f7ce0000680f62970ba80cd7b5
parent 8777f1913d34c3ecf72164ea85292e978e265edd
parent eec8af34d3129d0f37c45ff8a82b4212724a6d79
author Elliott Hughes <enh@google.com> 1417025423 -0800
committer Elliott Hughes <enh@google.com> 1417025423 -0800

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

Change-Id: I5a9504efe76adf3067103b0e641b3d121a1af4bd