tree 77098b2bef7cd2da30752d1b9a66444f4378d4b2
parent 71e4e67ccc9f5697ec26c5392eb01db0ba3e1e73
parent faba91b5e1dd2c7f82600c0f5920a7d6679ae169
author Andrew Hsieh <andrewhsieh@google.com> 1335336216 -0700
committer android code review <noreply-gerritcodereview@google.com> 1335336217 -0700

Merge "Fix a warning originating from Kernel header"