am 95464c9a: am 445ab76c: Merge "Broken build. Missing ;" into gingerbread
am 95464c9a: am 445ab76c: Merge "Broken build. Missing ;" into gingerbread

Merge commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85'

* commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85':
  Broken build. Missing ;

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