commit | 48d610a31bdc0aa75585e2d6c8940e760336728f | [log] [tgz] |
---|---|---|
author | Chih-Hung Hsieh <chh@google.com> | Sun Oct 26 22:47:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 26 22:47:46 2014 +0000 |
tree | 85ee24cff1a17cebae35acbac8c9c9420524a608 | |
parent | abdc7ad0f8af2892830a89c9699eaa5461d91b44 [diff] | |
parent | 25318f3270d4784fdcd686d18ab351f27688de94 [diff] |
am 25318f32: am 4b981bc8: Merge "Fix Clang compilation errors." * commit '25318f3270d4784fdcd686d18ab351f27688de94':