tree 3048ad71565968803cfe4ecdfa0627ba89146e55
parent 7d5484b0fc8904c51641f38c60bdbbf4c223b1ea
parent 4de4e6defce30e7693cea04e9553ee3bb1e72f88
author Calin Juravle <calin@google.com> 1414603951 +0000
committer Calin Juravle <calin@google.com> 1414603951 +0000

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

Change-Id: Ie5c1c814ccd819a592d834879173edb8af15a52d