am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev
am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev

* commit '1d39bab7af72e1df4ffe1ec0c9d3a7df549e45cc':
  Update IntelliJ project file for IntelliJ 14

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