tree aa6d2703a56f2a0fdc62dbeb528667056fd99521
parent 0fd5036fecc5d12d02ce75a5c66ed8f8fdff4132
parent 5add5bb77f4af3706d878651e2c1e2c45d463c86
author Todd Kennedy <toddke@google.com> 1462304585 +0000
committer android-build-merger <android-build-merger@google.com> 1462304585 +0000

Merge "Don\'t pre-opt shims" into nyc-dev
am: 5add5bb77f

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

Change-Id: Icdb0f8c897ba571ee8c022d964c951c96e137783