tree 918e06f17f9e8916136aee2c3563a6e3b40efccf
parent bf3df8729ce5c0885cd9a9ea73fa2352be4d2d30
parent a976a8221f8e65784357a50924da81397053b718
author Robert Greenwalt <rgreenwalt@google.com> 1466036119 +0000
committer android-build-merger <android-build-merger@google.com> 1466036119 +0000

Merge \"Move struct def out of an #ifdef\" into nyc-mr1-dev
am: a976a8221f

Change-Id: I415eb2ea039d2c147ced33fa2c21d5bde1c09b82