tree 9d0fa21005ba4a189635f96b91d13112efc5225f
parent 8a50328131307b53ebde95e9af87a408c4011559
parent 3f192b0dc687506fbc88c7f52f73f61bfa27d3e6
author The Android Automerger <android-build@google.com> 1438416145 -0700
committer The Android Automerger <android-build@google.com> 1438416145 -0700

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