Merge "resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp" into oc-mr1...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 5 Sep 2017 20:15:32 +0000 (20:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 Sep 2017 20:15:32 +0000 (20:15 +0000)
commit02b614843efe0e7206d1d5c92991c724eedc8202
tree621906acb27d94cc4faf563e1ba1283996554543
parent910d7d87ef996041b1d055f71c09bd7e882ef9d2
parent40ba3644f719c50e4ca50b38962255fe9d49b29c
Merge "resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp