tree 36f0c6f9ea1997e536b5b0b3db325803eba54116
parent 2f6c2e06a13e81b36365f60181189b6ce5f87c9b
parent 442cc6dc48f8188e097617f7f804c314a9dacd0e
author Andreas Huber <andih@google.com> 1392227574 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1392227574 +0000

Merge "Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s)."