tree 1ead7a95a014196b037e11d2ee69a0ae8ea59c9a
parent 21d87190ceaa8da2aa5425b4636fd29451500e6d
parent 0c9cdeab754b5f71fd8e6b027638410ce11f4d95
author David Gross <dgross@google.com> 1490757630 +0000
committer android-build-merger <android-build-merger@google.com> 1490757630 +0000

Merge "Revert "Structure layout logic cleanup.""
am: 0c9cdeab75

Change-Id: I01334181e0c8a98f10586bc588ff8fbc0e75076d