1221131150 - MergeBot - Merging frameworks/base from upstream sources
amending MergeBot commit - updated AndroidManifest.xml
Merge branch 'kk4.4' of github.com:cmbroms/android_frameworks_base into kk4.4