OSDN Git Service

resolve merge conflicts of 7408acb7be to mnc-dr1.5-dev.
authorSharvil Nanavati <sharvil@google.com>
Thu, 14 Jan 2016 19:59:33 +0000 (11:59 -0800)
committerSharvil Nanavati <sharvil@google.com>
Thu, 14 Jan 2016 19:59:33 +0000 (11:59 -0800)
commit00a44d2508e85b953d7343452063ade286e40ca0
tree075c60dc79ca2ec9fd663d57f2694fefa457c3de
parentf7388e685e5064e45ae5ee65ed6b6419cdef929c
parent7408acb7bec88316085791635ecd8117c1cfa1fb
resolve merge conflicts of 7408acb7be to mnc-dr1.5-dev.

Change-Id: I5f00746e95c703da91838395aa0c85a660cef2b1
device/include/interop.h
device/include/interop_database.h