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

* commit 'f12e394cd31b5caca3149e4c82e59c16ed1a4464':
  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