tree 95c382d0a66015b3479ac27e9cef925fe4fc1bae
parent 5eeb416a294e0fa45df24be8990ecd8a4552c24c
parent f942f98352545c89d872656dc18f025493b3b04f
author Chih-Hung Hsieh <chh@google.com> 1414363695 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414363695 +0000

am f942f983: am 20b68712: Merge "Fix empty struct C/C++ compatibility issue."

* commit 'f942f98352545c89d872656dc18f025493b3b04f':