tree bef603b043de0aea966fe338d856c0b2d130a4dd
parent dac964172756e29cbcfc8636a4722967decbea55
parent 2a64eecc02ffb5b991fb5c367eab777b1325eef8
author The Android Automerger <android-build@google.com> 1415549031 -0800
committer The Android Automerger <android-build@google.com> 1415549031 -0800

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