am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
am f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs

* commit 'f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
  add tags for wakelock and other API names

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base