tree ebd4d739215332e242fa5cba88f95c0791873d42
parent 5743f7ef6fd1045d5314929b16c92a267004e384
parent 0ae171a60f75c6900bc3cbdccaad66f2a70f31b8
author Stephen Hines <srhines@google.com> 1440672616 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672616 +0000

am 0ae171a6: (-s ours) am 01d9b04d: Fix C++ reflection of vector types.

* commit '0ae171a60f75c6900bc3cbdccaad66f2a70f31b8':