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:51 +0000 (01:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:26:51 +0000 (01:26 +0000)
commit2a86cae3e3846bbf9b5bf303bd440d58f58a344f
tree738e67d80612a66c1d15e6f658346c439f54a81b
parent2e45626530d7fe7ed4573d0f94700dcee83cbff1
parentc4bc5d2c5adb552aab0b339eba241e837aaf6b71
resolve merge conflicts of 1f433cb to mnc-dr-dev am: f15ca6d21d  -s ours am: 8e80a26078 am: edb7ce120e
am: c4bc5d2c5a

Change-Id: I04df6e39839bedf8b40ffd66955d2684b45093bf