OSDN Git Service

Merge "resolve merge conflicts of 6c3cd4449517 to oc-dev-plus-aosp" into oc-dev-plus...
authorLorenzo Colitti <lorenzo@google.com>
Tue, 28 Mar 2017 16:37:52 +0000 (16:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Mar 2017 16:37:56 +0000 (16:37 +0000)
commite8f5bbf82b51667b12785e161e33b227cf828e91
tree90f684f0fdbd77557e694fb1a0cce4fcf3435bb7
parentad0e35c485ce90eb7a2429fa977e1f12ec3c3b69
parent9570e7dae77d05c9a7de1a439e4a32b1e330f958
Merge "resolve merge conflicts of 6c3cd4449517 to oc-dev-plus-aosp" into oc-dev-plus-aosp