tree fcf6dcd841adc8342c418675cd2307b5acb1b902
parent 006c79750f8494ea445316f608905216693c6814
parent 1579cb453e9a5bd82327be59ceaac2c6dbccce60
author The Android Automerger <android-build@google.com> 1416492657 -0800
committer The Android Automerger <android-build@google.com> 1416492657 -0800

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