tree 2e4ac5ff6c9ea46a2392cc62561674d491fba326
parent 6fe31b2f830309c2a8e0035c07b6b2bb44e081c9
parent 6e34793b9cf11237670a5daa320cd784f7442532
author Kristian Monsen <kristianm@google.com> 1390947915 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390947915 +0000

am 6e34793b: Merge "Fix code style, put unused in the end"

* commit '6e34793b9cf11237670a5daa320cd784f7442532':
  Fix code style, put unused in the end