am 9cd582f8: am a37be42f: Reformat to Android style guidelines

Merge commit '9cd582f8cbeafea1fb697d3afaee653c2c2aab49'

* commit '9cd582f8cbeafea1fb697d3afaee653c2c2aab49':
  Reformat to Android style guidelines