tree 3d6aa82dad70adf37fb62f45f69e32403a79c8cc
parent 97f3d073ac8cfb8043fcf6ee0b80d5f515ad36c4
parent 4be3610636674b747839c3f604d25d0c5aa4fc78
author Tim Murray <timmurray@google.com> 1418863267 -0800
committer Tim Murray <timmurray@google.com> 1418863267 -0800

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

Change-Id: If504710a618d8c3adf85297d5fd2909558ed57a3