am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev
am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev

* commit 'fce896feaf9c26bdc3806a48ec01e6e077c5c975':
  Docs: adding closing bracket to un-break javadoc tokens.

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