tree a22630c07971904afd6f6eb30f5adb72d9de6265
parent a1f40f93fc1eb046a06683cafc62205a7ec6ca0c
parent 157de7240876033492880e6f5e6788305a8d290c
author The Android Automerger <android-build@google.com> 1415283306 -0800
committer The Android Automerger <android-build@google.com> 1415283306 -0800

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