tree eb2f41088d040a14946feca1972ebb4f75dbc027
parent 251ef626bbc78a8b91459a3522e83c0e06499c25
parent 7d6e54e49c43136aa34cc8806a954b22aa875f07
author Jean-Baptiste Queru <jbq@google.com> 1283986309 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283986309 -0700

am 7d6e54e4: am ccc10925: fix typo

Merge commit '7d6e54e49c43136aa34cc8806a954b22aa875f07'

* commit '7d6e54e49c43136aa34cc8806a954b22aa875f07':
  fix typo