tree ed34ef48b170584425b0e7f37639bdfa2a2a341c
parent 507ea383aaaea5634c79d20911773aa44324e7f5
parent 1dd5a532492dc4ad56c2196eaa3beb905f35b028
author The Android Automerger <android-build@google.com> 1422367720 -0800
committer The Android Automerger <android-build@google.com> 1422367720 -0800

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