tree 695e55fe33847420a7162a966bd4fa88d7392643
parent 3b1435ab03be81ed669cc7cfb98310f483000510
parent 1d999b7cdfb58fcbf0de2210f21c3a5f8ca5cefb
author Marco Nelissen <marcone@google.com> 1487113863 +0000
committer android-build-merger <android-build-merger@google.com> 1487113863 +0000

resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe am: 33d9d00a3c am: 858542d83e am: 2e4b53cfb4 am: 7c50684ef0 am: 834462327b
am: 1d999b7cdf

Change-Id: Ie8600c23f61f3300cfe31e623f8c330115a6a7ef