tree 90f684f0fdbd77557e694fb1a0cce4fcf3435bb7
parent ad0e35c485ce90eb7a2429fa977e1f12ec3c3b69
parent 9570e7dae77d05c9a7de1a439e4a32b1e330f958
author Lorenzo Colitti <lorenzo@google.com> 1490719072 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1490719076 +0000

Merge "resolve merge conflicts of 6c3cd4449517 to oc-dev-plus-aosp" into oc-dev-plus-aosp