OSDN Git Service

Merge "Re-enable OSR."
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 16 Feb 2016 11:07:55 +0000 (11:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Feb 2016 11:07:55 +0000 (11:07 +0000)
am: 707954befd

* commit '707954befd63af9d970cc3f697dd9bfbdcbcf37b':
  Re-enable OSR.


Trivial merge