tree 0012647aaf40f4ee7965aaac35d0421469e74b5a
parent 3677dd81bbd04fba71b4490254351735fbf2c57a
parent 41b9550b2924c2953588f9693aa5ff42c0cf8450
author The Android Automerger <android-build@google.com> 1423490897 -0800
committer The Android Automerger <android-build@google.com> 1423490897 -0800

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