tree 8b2fc70ebd03af2f2944b45664d8a333138246ed
parent 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
parent 75cb3c4180957929221e39a0521595634fc0700e
author The Android Automerger <android-build@google.com> 1414242607 -0700
committer The Android Automerger <android-build@google.com> 1414242607 -0700

merge in lmp-mr1-release history after reset to 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51