tree 1121ab3e9c81f7abca7063a732de35acef1500bf
parent 57b5326561b6edb22b09016985b41b7cdb2156c0
parent 7c1a2dfa8930fd12bb8791fc02bace751917bdee
author Dirk Dougherty <ddougherty@google.com> 1277231159 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277231159 -0700

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

Merge commit '7c1a2dfa8930fd12bb8791fc02bace751917bdee' into gingerbread-plus-aosp

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