tree 58e91dca56a3a21b20c1a9cf34826f216dddc812
parent 0f75f06f3b7a9ecee2b01bcffc9c56ca6b40b5c2
parent 76f2d69c0712c4491206a224c1e7d1c60dc533da
author Pawin Vongmasa <pawin@google.com> 1468283954 +0000
committer android-build-merger <android-build-merger@google.com> 1468283954 +0000

resolve merge conflicts of 8fc0fd2 to mnc-dev am: 542a057a22
am: 76f2d69c07

Change-Id: If47c4ba7629d06516845a0477b2ce3a0b1611d82