tree 2fcd0c564e58beaa1628cf45bd7f1fcfdfd62bdd
parent f0915060c63b1eb6201817ca456c56bfd9ab0860
parent 101c0258cca61881463ac9134e57d0ea155604f0
author Joachim Sauer <jsauer@google.com> 1505825699 +0000
committer android-build-merger <android-build-merger@google.com> 1505825699 +0000

Merge "Remove use of MeasureUnit.internalGetInstance" into oc-mr1-dev am: 61faffd75b
am: 101c0258cc

Change-Id: I4eb02e0ebc0132f8d434c51fe53cc648d8310293