tree 07027eb0d6391678d54f3b0fe08cfa46f3c2cdd6
parent d25be0ea48c775e4038163b546c9553e294d4fdc
parent 02d3387d7948c5ecd362c5ead6607b6f4ac02668
author The Android Automerger <android-build@google.com> 1423491017 -0800
committer The Android Automerger <android-build@google.com> 1423491017 -0800

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