tree 55e3c6c566d82bf2959f4b1ed9fdfb4fa9daa7f5
parent 6283854f7e035977ffe51e3b4b453f5c0ea87f36
parent 6effd73808f68ddf3abe99fe7d2522bd52c6b868
author Owen Lin <owenlin@google.com> 1320360247 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320360247 +0000

am 6effd738: am 629ac4c4: Fix incompatible issue.

* commit '6effd73808f68ddf3abe99fe7d2522bd52c6b868':
  Fix incompatible issue.