tree e46cb69f1426df33ce5f73de201110eb991edb9c
parent dedee688fdb89b55be2b130e3296abce98e12698
parent c80d58c21ccf58454fd162bf549d78379aa9ed81
author The Android Automerger <android-build@google.com> 1415455877 -0800
committer The Android Automerger <android-build@google.com> 1415455877 -0800

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