OSDN Git Service

resolve merge conflicts of 7d0ad232f to oc-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Thu, 13 Jul 2017 20:54:51 +0000 (20:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Jul 2017 20:54:51 +0000 (20:54 +0000)
commit65f92f4ac93a6723c70e3e0479eb06a997a489b8
tree67ffff4b42cd795ab716ec29e0596c7ae6d07eda
parent842bac755011fa566d5d97b6a1d70b5b8d585436
parentaa7f7079f79870b5fa14bca867136c905a5f9f9e
resolve merge conflicts of 7d0ad232f to oc-dev-plus-aosp
am: aa7f7079f7

Change-Id: Ica0e8327a1eb5ffcd5a60aa3cdd842943f508d15