tree 8a39ea9040d36a498bfb15815d16aa49f1bc06bb
parent e034635a6f88e1aad673e9f46237b2d53eb7a6ca
parent 1ef6a6ad1a9708b79fc7c45296ddfa890d645064
author Orion Hodson <oth@google.com> 1508230669 +0000
committer android-build-merger <android-build-merger@google.com> 1508230669 +0000

Merge "Revert "Cleanup transitive includes in the legacy inlines.""
am: 1ef6a6ad1a

Change-Id: I0315635bb56d3948c156984f7d21d8fb5cdee0a1