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

* commit '552eba80ef8f48204e77129dd99581d8f0ac3831':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings