tree 985937655234bf0f48cecb36793fac846911244f
parent 070eea05f2f2d47aa873fd1e79160eb8529a0eb8
parent b34979a5a361f2148f254ae08648bf55f6589c98
author The Android Automerger <android-build@google.com> 1424268310 -0800
committer The Android Automerger <android-build@google.com> 1424268310 -0800

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