tree 08c64df72f4134a3b6a5fde3492681655a9cce09
parent 350074487acb6e5b75cf3149ebe815e060e60394
parent 1047d72d987b81817dcd6110f48309db98fee4b8
author The Android Automerger <android-build@google.com> 1414588256 -0700
committer The Android Automerger <android-build@google.com> 1414588256 -0700

merge in lmp-mr1-release history after reset to 350074487acb6e5b75cf3149ebe815e060e60394