am a37be42f: Reformat to Android style guidelines

Merge commit 'a37be42f9f4d0f54f8ff10524ee023177f0b7990' into gingerbread-plus-aosp

* commit 'a37be42f9f4d0f54f8ff10524ee023177f0b7990':
  Reformat to Android style guidelines