tree 0a5abc951e9de946adc22dfb057c6da22aae9def
parent b0c7a8726099bf7a4cad338cbef54e5aa8bf9bd3
parent 59f6fc35e9eb53cd01bf8150bc393be569e28c5d
author David Gross <dgross@google.com> 1490896792 +0000
committer android-build-merger <android-build-merger@google.com> 1490896792 +0000

Merge "Structure layout logic cleanup." am: cdaa220180 am: 0932a27903
am: 59f6fc35e9

Change-Id: I9beb6e25d2bc74df2b81f073967871d1bee0bd41