OSDN Git Service

resolve merge conflicts of 40da4609e to oc-dr1-dev-plus-aosp
authorJiyong Park <jiyong@google.com>
Tue, 27 Jun 2017 00:59:06 +0000 (09:59 +0900)
committerJiyong Park <jiyong@google.com>
Tue, 27 Jun 2017 01:48:28 +0000 (10:48 +0900)
commitbffa875d78e9ed203aec3e308fcb4cf86582f3f9
tree8bc1ea2fc24ddeb234c126f2a5fc78b216c9c9a5
parent3806ea87d63ec7a93d431a4b4e391bbadbefb4ca
parent40da4609e49a90ce84e9152fc23bd6721891836e
resolve merge conflicts of 40da4609e to oc-dr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0c4a9e0648674b78391e257f6a94bd1e325e1964
libs/binder/Android.bp