tree 6a461ec33ed37944aa0c8296549f724aeba1bc7a
parent fc42f8df9752ae4ecb87fbea9ece3f65395785f0
parent 16104486171972a87a8c0c621f1e66540928fad5
author The Android Automerger <android-build@google.com> 1415888247 -0800
committer The Android Automerger <android-build@google.com> 1415888247 -0800

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