tree ebda3154bb85bd2dcc8d4272526a6419ff16764c
parent fe8563f4f2a6efe1eb00bb41a5037c88917becfc
parent 835499a41d46d16a1213241df1a299d86f8d0e1c
author The Android Automerger <android-build@google.com> 1414501810 -0700
committer The Android Automerger <android-build@google.com> 1414501810 -0700

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