tree b82aae71a2cbd15ccf2dfd59f8e42090b0c0f289
parent b0693ec58247c36a7427267783cb756cc055aed8
parent 609f5cb21d98af1290fcdad6e8e291c257d32995
author The Android Automerger <android-build@google.com> 1414674537 -0700
committer The Android Automerger <android-build@google.com> 1414674537 -0700

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