tree ebd4d739215332e242fa5cba88f95c0791873d42
parent 9c2a8b4cee77ccf7e237844fa96946c93a615b5a
parent 9366848924653f9c7b9046a5a6ebf1e6f4dc4846
author Stephen Hines <srhines@google.com> 1440672615 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672615 +0000

am 93668489: (-s ours) am 1919835e: am f508166b: Merge "Fix C++ reflection of vector types."

* commit '9366848924653f9c7b9046a5a6ebf1e6f4dc4846':