tree 8a39ea9040d36a498bfb15815d16aa49f1bc06bb
parent 37616ec3a29c6cce7982ee58a7b89b0a075383a3
parent e7b0fe7996e82c965721dae4b1b2d3a43fff4241
author Orion Hodson <oth@google.com> 1508230861 +0000
committer android-build-merger <android-build-merger@google.com> 1508230861 +0000

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

Change-Id: I4915ab1c62af7b862b4235b67d01581713e47933