tree a62396ad377f7266b4dab7f7a27dcaed1749a501
parent 3e7688d0415af5cb805f3ece39fec4303eb834a9
parent d28ceb16f5967b9ef3fcf150507cce8cbc2b12c0
author The Android Automerger <android-build@google.com> 1425564310 -0800
committer The Android Automerger <android-build@google.com> 1425564310 -0800

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