tree 3b156f95668291fe7feee7a756b49892cc73ab60
parent 6c78e7d7724a431dbdb2b0a5bb8cd2b07424cbe5
parent 88aba541a0ce93dc4f2198ff25cce3cf41016e17
author Dan Albert <danalbert@google.com> 1418940523 -0800
committer Dan Albert <danalbert@google.com> 1418940523 -0800

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

Change-Id: Ie5ef819dd8168cb6a73f84a881a92c116705fffc