OSDN Git Service

Merge "Don\'t pre-opt shims" into nyc-dev
authorTodd Kennedy <toddke@google.com>
Tue, 3 May 2016 19:43:05 +0000 (19:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 3 May 2016 19:43:05 +0000 (19:43 +0000)
am: 5add5bb77f

* commit '5add5bb77f4af3706d878651e2c1e2c45d463c86':
  Don't pre-opt shims

Change-Id: Ia47c9cf03f15f317ecef1561428a9d693913865b


Trivial merge