tree 6987badedeb736cac0651bb10db416d3836c4f16
parent 623cfb01dd4e7b0ab9fbb136c016034e2c440d52
parent 8f7916073000b7716e86e9ef8f042953e0fdae9b
author The Android Automerger <android-build@google.com> 1426683934 -0700
committer The Android Automerger <android-build@google.com> 1426683934 -0700

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