tree e242e71c1be0c03833416c67895ac1673fe52864
parent b87d6d2a885cace025b33d6508b3b637dc113b05
parent 9ad2dda1991f3d0d27a3d1208895a57b54bd0bda
author The Android Automerger <android-build@google.com> 1417442891 -0800
committer The Android Automerger <android-build@google.com> 1417442891 -0800

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