tree 9821204836dbea8ccfb7eedf7ba0aae52eb45e52
parent b66ad72806bddc5f4d002e0bb93d7184bccfde02
parent 7c93881209c4661425c6d9fbeb9d62d3f6836332
author The Android Automerger <android-build@google.com> 1450212893 -0800
committer The Android Automerger <android-build@google.com> 1450212893 -0800

merge in mnc-mr1-release history after reset to mnc-dr-dev