OSDN Git Service

resolve merge conflicts of 1f433cb to mnc-dr-dev
authorSharvil Nanavati <sharvil@google.com>
Wed, 22 Jun 2016 01:13:44 +0000 (01:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:13:44 +0000 (01:13 +0000)
commit8e80a26078aeffb84800f41aa5f9549dc813661c
treebc5655476b967620ceb8772fbf5e45f7bd8ee66e
parent34619f8e30adb98a2a605665b02df16a9fda6032
parentf15ca6d21d08a9adb81e581d512f79aa6dbe1887
resolve merge conflicts of 1f433cb to mnc-dr-dev
am: f15ca6d21d  -s ours

Change-Id: Ic1a23e2c6d0284b9fdf346a681f59cdcbaa599e0