tree c53bc0334e9846ee7127604c88d66771e57a9ea5
parent f98d3e3047d87bc468eefa4e1f4f481ed75bc708
parent 8279c754d176d5c2aa23f6f7ad16fcea03278788
author Konstantin Lopyrev <klopyrev@google.com> 1281502429 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281502429 -0700

am 8279c754: am 91a7f5fe: Making sure that the prefix is handled properly.

Merge commit '8279c754d176d5c2aa23f6f7ad16fcea03278788'

* commit '8279c754d176d5c2aa23f6f7ad16fcea03278788':
  Making sure that the prefix is handled properly.