tree 9555adceec5a5d6ac273fa107d882be8c8e5a143
parent 056fe7952ef930157ba79e5c247cec93de17ddc2
parent a37be42f9f4d0f54f8ff10524ee023177f0b7990
author Mathias Agopian <mathias@google.com> 1282002877 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282002877 -0700

am a37be42f: Reformat to Android style guidelines

Merge commit 'a37be42f9f4d0f54f8ff10524ee023177f0b7990' into gingerbread-plus-aosp

* commit 'a37be42f9f4d0f54f8ff10524ee023177f0b7990':
  Reformat to Android style guidelines