OSDN Git Service

Merge "resolve merge conflicts of 989b267015b9 to master"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 17 Jan 2017 01:35:29 +0000 (01:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 17 Jan 2017 01:35:33 +0000 (01:35 +0000)
commit9c7c23688e79694f3e1234b8d601570718f8a921
treeddce1bed4ef65fc748e018be147b49441225d710
parentc70e581564c4500019b9f898713af96ec452fb08
parentb82f3b09f38bd5667bb66b22a5490430418f5f8a
Merge "resolve merge conflicts of 989b267015b9 to master"