tree 6514222bdf4393408b1e473f288b51134845c466
parent df9f6a80788c25da9a8fafd2bfc69f4e772f5b5e
parent b19cc7baa931fe7af87ab1c6a372bec723a44d75
author Nick Pelly <npelly@google.com> 1287422790 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287422790 -0700

am b19cc7ba: Merge "Update permission name for Tag app." into gingerbread

Merge commit 'b19cc7baa931fe7af87ab1c6a372bec723a44d75' into gingerbread-plus-aosp

* commit 'b19cc7baa931fe7af87ab1c6a372bec723a44d75':
  Update permission name for Tag app.