tree f73fde8f1e524b80e774118296967f17ff1d1c10
parent 7b11f62a348602ac20faaec8f4d3ab684abb93b4
parent 64884bb1352bb76ee5fa55ac04743678bdf4b180
author Andreas Gampe <agampe@google.com> 1411599612 -0700
committer Andreas Gampe <agampe@google.com> 1411599612 -0700

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