am 6a66cfce: am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev - platform/frameworks/base

diff options

author	Scott Main <smain@google.com>	2012-11-01 15:20:47 -0700
committer	Android Git Automerger <android-git-automerger@android.com>	2012-11-01 15:20:47 -0700
commit	02acfc79c18bf5bbe5e6456d8767c53a3b8de6eb (patch)
tree	407951cd6c2c8932d57e9c35f09f91fd9d0fdb27 /include/androidfw/KeycodeLabels.h
parent	8b91e6bab8ac21bba17efd0cad3a512790132846 (diff)
parent	6a66cfce8bd564664ea77d9204df91e98af2a2f1 (diff)

am 6a66cfce: am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev

* commit '6a66cfce8bd564664ea77d9204df91e98af2a2f1': docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263

Diffstat (limited to 'include/androidfw/KeycodeLabels.h')

0 files changed, 0 insertions, 0 deletions