OSDN Git Service

resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1
authorMarco Nelissen <marcone@google.com>
Mon, 13 Feb 2017 23:13:36 +0000 (23:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Feb 2017 23:13:36 +0000 (23:13 +0000)
commit24058e96b3e1b13ae6636826f0a4cd1cd631e8ec
tree5cf57150462d325b4ff723d64ee883591fa10552
parente1b8152064df82d8f7afb026479ee87f534388cb
parent86d5e962ce26dde45d961836f0926f86e4ac788c
resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1
am: 86d5e962ce

Change-Id: I59f1dc2a12d44018e3e8b74bcc6d9c775f896381