OSDN Git Service

resolve merge conflicts of 1f433cb to mnc-dr-dev am: f15ca6d21d -s ours am: 8e80a260...
authorSharvil Nanavati <sharvil@google.com>
Wed, 22 Jun 2016 01:26:32 +0000 (01:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:26:32 +0000 (01:26 +0000)
commitd395be3fc571ee2889f41fd095e80e849d30ee8d
tree77d06c957a28747adedb0c8c2374ceba3f5d8b09
parent19d186f6778ae366ca6291a35149802f724fe17d
parentc4bc5d2c5adb552aab0b339eba241e837aaf6b71
resolve merge conflicts of 1f433cb to mnc-dr-dev am: f15ca6d21d  -s ours am: 8e80a26078 am: edb7ce120e
am: c4bc5d2c5a

Change-Id: Idc155f2aaaf932a64da86c9c82c9a787ac460807