am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev
am 69f09fe8: Merge "Build LayoutLib tests with Java 6" into lmp-dev

* commit '69f09fe8260cb204c57d5fca14ebeacf6ff51161':
  Build LayoutLib tests with Java 6

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