am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev

* commit '78df332ef1a6be3cda40b776a6321425fa829ddb':
This commit is contained in:
The Android Automerger
2015-10-06 00:01:46 +00:00
committed by Android Git Automerger

Diff Content Not Available