tree 4a274cb51bb8c9e08d885628c5dc40b4e89f96f3
parent 499127eab812088ca24421b59ebfac6f47ea850f
parent 03eccb6616744c3789b6018680de7bf5a18f71ce
author Dan Stoza <stoza@google.com> 1421453931 -0800
committer Dan Stoza <stoza@google.com> 1421453931 -0800

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

Change-Id: I1f38cbe7019b2b48b1094dee154ad97c23fd22c2