OSDN Git Service

resolve merge conflicts of d3b56698c to oc-dev-plus-aosp
authorJeff Hao <jeffhao@google.com>
Wed, 19 Apr 2017 20:37:47 +0000 (13:37 -0700)
committerJeff Hao <jeffhao@google.com>
Wed, 19 Apr 2017 20:37:47 +0000 (13:37 -0700)
commit99d7da990339a91a9cc78fb491a1356809890755
tree41420f02fffaa0beac3c4e49d1f6617ca1b12ad5
parentb87f3e859d031cb247fc8b1fad8199af8a5b15cb
parentd3b56698c3154298ce3953a64a1b770134a5e870
resolve merge conflicts of d3b56698c to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iae7fc90e9281102fb32dcc214838f590b9576f7a