am 5fb6ce29: am 00a8344a: Merge "Workaround b/16818336 which fails build under aggressive inlining." into lmp-dev

* commit '5fb6ce295038d345dee354b93c2fc408effdd29c':
  Workaround b/16818336 which fails build under aggressive inlining.
This commit is contained in:
Elliott Hughes
2014-08-06 23:00:48 +00:00
committed by Android Git Automerger

Diff Content Not Available