tree ebda3154bb85bd2dcc8d4272526a6419ff16764c
parent fe8563f4f2a6efe1eb00bb41a5037c88917becfc
parent fa0ceba80c412f9606031d04ce4a7f528a74e5cb
author The Android Automerger <android-build@google.com> 1414588132 -0700
committer The Android Automerger <android-build@google.com> 1414588132 -0700

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