tree 1fbd89f39c87e7b6ea265666e879da6a7cd0ae74
parent be215ae0646a0f3b063239554d22e79df1e17935
parent ed954f9bc03f7f7f1855593bbad8097bfe16957c
author The Android Automerger <android-build@google.com> 1423490937 -0800
committer The Android Automerger <android-build@google.com> 1423490937 -0800

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