OSDN Git Service

resolve merge conflicts of 1f433cb to mnc-dr-dev am: f15ca6d21d -s ours am: 8e80a26078
authorSharvil Nanavati <sharvil@google.com>
Wed, 22 Jun 2016 01:19:12 +0000 (01:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:19:12 +0000 (01:19 +0000)
commitc4bc5d2c5adb552aab0b339eba241e837aaf6b71
treed9ca4712274152f0c0fcfab25eeb957a38c0b3a3
parent92e0f19ff01e610a561ce27017e44b70ca246fc4
parentedb7ce120e7e9ff051baf30e5c05d8483c892425
resolve merge conflicts of 1f433cb to mnc-dr-dev am: f15ca6d21d  -s ours am: 8e80a26078
am: edb7ce120e

Change-Id: Ie7ea41474e11479b54ba526294977dfaa60c8cd7