am 2284ef40: am 15b6cc56: am b4b448a9: am 97dba6cf: Merge "emulator gralloc: removed compilation warnings."

* commit '2284ef400c8e94c782e3c4d392bf6767fb1f1d85':
  emulator gralloc: removed compilation warnings.