am 6d132aa0: Merge "Code cleanup."

* commit '6d132aa09fa80fc656add0d90d983fa6b330f78a':
  Code cleanup.
main
Keisuke Kuroyanagi 2014-05-13 03:08:58 +00:00 committed by Android Git Automerger
commit f87811157c
4 changed files with 4 additions and 4 deletions