tree ab4bf9240b9b8aa7c34c0b06d930f981332b7ae3
parent 13e2fdfa8c689a3f6e3fc5d2c8c3cea9c85c0387
parent 02675aaa12fa3bda00bb1b206edfc1001ccf5696
author Brian Carlstrom <bdc@google.com> 1349481010 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349481010 -0700

am 02675aaa: Merge "Rename assembly files with .S extensions."

* commit '02675aaa12fa3bda00bb1b206edfc1001ccf5696':
  Rename assembly files with .S extensions.