tree 69b5587c0209a4100bddca39762647e7c362d4ce
parent 15f2be1f5271c66fe0b5966f1d063402b86e8fa7
parent 70fe7366dfd5b9ddf85dbfb18dd9ccfd8194a40e
author Jean-Baptiste Queru <jbq@google.com> 1361313440 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361313440 -0800

am 70fe7366: More reformatting for uniformity

* commit '70fe7366dfd5b9ddf85dbfb18dd9ccfd8194a40e':
  More reformatting for uniformity