tree 043680fc9f6d686dfeb8ac5a0129b6fdc61fb3e8
parent 27209ff8d25be29db541a9772a0da818b4b834b8
parent af2bd0869f68c9ab48c2a5bb7ffd2fda78789666
author Dan Rodney <danrodney@google.com> 1421795026 -0600
committer Dan Rodney <danrodney@google.com> 1421795026 -0600

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

Change-Id: Ic8655447bac2d8a780fd21293cc3ccaa320d4eb8