OSDN Git Service

resolve merge conflicts of 2ff6320d773c to oc-dr1-dev
authorRubin Xu <rubinxu@google.com>
Mon, 4 Dec 2017 17:07:19 +0000 (17:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Dec 2017 17:07:19 +0000 (17:07 +0000)
commit92609c7db1c2c78135fc4564d0caa8d57279cdfd
treea02a7f0adf770d8077c22317bd457c8a71fde4c1
parentb3ce6d33e07625a42181d23d62a7cc775eee3795
parent59f44d34c64aa26e03855a2434c196f2c40fc700
resolve merge conflicts of 2ff6320d773c to oc-dr1-dev
am: 59f44d34c6

Change-Id: I7afc27da73c5a54537fcd8f49128752e00a954ea