tree a988d482961c3c2fc7ee82f4b0ce53961ddc1183
parent 488d284bb1dae8f68d69e6ea0f77482b147fc9fd
parent 27b39fc1f0a929a8d9ea284017f50adfd7702ccf
author The Android Automerger <android-build@google.com> 1417545256 -0800
committer The Android Automerger <android-build@google.com> 1417545256 -0800

merge in lmp-mr1-nova-release history after reset to lmp-mr1-release