tree 932abf0484cbf1553abcd404dd9ad3a4ddcdac22
parent 1e3e1ddf939bf71616245e1e100964568053d665
parent 1fed51e4eab15ec53d2c54522bebe5ce64129d73
author The Android Automerger <android-build@google.com> 1423577532 -0800
committer The Android Automerger <android-build@google.com> 1423577532 -0800

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