tree 1ec2937c08f6085ace09fb94f1951a82e8c484e7
parent 5567177a41adac6d2520a6a0ac2b9edb9be65d60
parent 98d537ec9527b41f0e4a9f8ea186a40298b25a4a
author Martijn Coenen <maco@google.com> 1484635854 +0000
committer android-build-merger <android-build-merger@google.com> 1484635854 +0000

Merge "Testing struct that has vector of other struct" am: 0bb0ba5f79 am: a69c3034fa am: dabf160073
am: 98d537ec95

Change-Id: Ia384675237edd335e117991607e1a39f6f46dd74