tree f2005265f38360ad30b7195e6a244f432445a4fa
parent b1fd96f45674a9676eb39b8c5fbb6fe7f690b6b3
parent f87a469412722556fb5eead131983adce4ba06f2
author The Android Automerger <android-build@google.com> 1412773848 -0700
committer The Android Automerger <android-build@google.com> 1412773848 -0700

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