am 153ec6ca: am 3545433d: am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"

* commit '153ec6cae7db2053c71541af8973244f0dbf6d4a':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings