OSDN Git Service

Merge "resolve merge conflicts of 1fae62661258 to oc-mr1-dev-plus-aosp" into oc-mr1...
authorAndreas Gampe <agampe@google.com>
Wed, 25 Oct 2017 05:22:04 +0000 (05:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 Oct 2017 05:22:04 +0000 (05:22 +0000)
commitc4ca931dc558ef860f9c3a914d4ec4b933847e02
tree6006219312b8d85d73f1f68647bb0c7e22278660
parent51c2848c449a322afc3977f4918a84b40b0a734e
parentb88a71e60c904b0fe1b91e0b52ca99517c969a3b
Merge "resolve merge conflicts of 1fae62661258 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp