tree dfec0613ceb0d7e486399eaa5d6f324638458814
parent f1d817bd46a1a5efe26c978baad3e802c702fb63
parent 5b9d0ba470eaa0eac195dc7cf6e2d4a8cb495074
author Alan Viverette <alanv@google.com> 1520387807 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1520387807 +0000

Merge "Restrict OCR+2 until refactor has landed" into pi-preview1-androidx-dev