tree 4246343ac367bb4c92f08e51aca8f6280aea3a57
parent a909e5e2a1e5342a45d73588544fe78656e22a68
parent 26b614ddf6a135e37ffd5c2b2a619fdf90569de4
author Christopher Ferris <cferris@google.com> 1508786531 +0000
committer android-build-merger <android-build-merger@google.com> 1508786531 +0000

Merge "Multiple bugfixes, small restructuring."
am: 26b614ddf6

Change-Id: I7a44bbfe9f43981031fc6cc84de08cef79d78e78