OSDN Git Service

resolve merge conflicts of 1f433cb to mnc-dr-dev am: f15ca6d21d -s ours
authorSharvil Nanavati <sharvil@google.com>
Wed, 22 Jun 2016 01:16:24 +0000 (01:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:16:24 +0000 (01:16 +0000)
commitedb7ce120e7e9ff051baf30e5c05d8483c892425
tree46e9d0b89763373a3e6fcf406a497ee008413a46
parent84970d13000623b266a72433474c4c2ae6abd3c6
parent8e80a26078aeffb84800f41aa5f9549dc813661c
resolve merge conflicts of 1f433cb to mnc-dr-dev am: f15ca6d21d  -s ours
am: 8e80a26078

Change-Id: I54a690024ccd316058d9d59ff7b16206f7fcd543