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

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

Diff Content Not Available