tree a9281cbfdd4e3450e445b80bea491e9c59df4b88
parent 4314dcb6f5eb0484f17d9096e45e8ae9c3bb1f72
parent b7c42b8fdabd706efb12111b0335b17ab84f94b3
author The Android Automerger <android-build@google.com> 1422281422 -0800
committer The Android Automerger <android-build@google.com> 1422281422 -0800

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