OSDN Git Service

Merge "Re-enable OSR."
authorNicolas Geoffray <ngeoffray@google.com>
Fri, 12 Feb 2016 13:30:34 +0000 (13:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Feb 2016 13:30:34 +0000 (13:30 +0000)
am: 5960a3f430

* commit '5960a3f430d1e7f47ea3db9a8364dc82e3f8add9':
  Re-enable OSR.


Trivial merge