tree 89fd91dc44c61c6890d851e6d82cb81bbf6f7921
parent 584bd35ababfc122e1d5ed84787702c8913bca8c
parent 17ae646586663c59ad360bb72884beded7475687
author Dirk Dougherty <ddougherty@google.com> 1277231041 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277231041 -0700

am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo

Merge commit '17ae646586663c59ad360bb72884beded7475687' into froyo-plus-aosp

* commit '17ae646586663c59ad360bb72884beded7475687':
  Doc change: Fix description of certificate matching requirement for app updates.