tree e9925efeefd9914f43c9a06b902cf503cf82f332
parent 3f0866e144fdf467017f2f5b467d33ec8cc2dbe4
parent ee235414493f963dcbbf7d4f87f725055315d442
author The Android Automerger <android-build@google.com> 1449772816 -0800
committer android-build-merger <android-build-merger@google.com> 1449772816 -0800

merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: 78df332ef1
am: ee23541449

* commit 'ee235414493f963dcbbf7d4f87f725055315d442':