tree 82afa467b14897d0686e6f753b03302fa126d434
parent 202c5af4be8f804ee68bdca82e760473b211b25c
parent 62398781f5a4ce32906cdbfc1ad8c34357e19eac
author TreeHugger Robot <treehugger-gerrit@google.com> 1506733071 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1506733071 +0000

Merge "resolve merge conflicts of 73d9596bc to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp