am 93b01600: Add native include path.
am 9ca21644: build: Fix including WHOLE_STATIC_LIBRARIES in static libraries
am ac06ea78: am e59de21b: am 74108dea: fix css bug for paragraphs in table cells  - only select the direct descendant for p:last-child in a td
am 7fa3aa53: am 93b01600: Add native include path.
am 80d38729: am 9ca21644: build: Fix including WHOLE_STATIC_LIBRARIES in static libraries
am 41e5e60b: am ac06ea78: am e59de21b: am 74108dea: fix css bug for paragraphs in table cells  - only select the direct descendant for p:last-child in a td
am 2915cc3e: Enable NX protections
am 8084f8c1: am 2915cc3e: Enable NX protections
am ea4b1a86: am aed937ba: am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
am 7c1a018f: am f9e275b0: merge from open-source master
resolved conflicts for merge of 54c29015 to master

Change-Id: I0b45ef84343289e84c6bcdf64b6ca4c0aff414c5
am ccb0c7cd: am 7c1a018f: am f9e275b0: merge from open-source master
am 8a5d30e7: am 6e079d7e: am 03fb96f0: Allow for a slightly larger libwebcore, add another library to the list, correct/update a couple entries, and add a couple more comments.
resolved conflicts for merge of 541c3f81 to master

Change-Id: I1a58398c79e538db8bac65b9f4d92028f1eca69e
Quiet the build a little more.

Change-Id: Id15808249800f32671bb902872b50051dfcb9909
Fix and enable JarJar in Java builds.

java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed.  This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.

Change-Id: If24113f399a168939a1a1d0738c5df57caf8d05f
build: Add support for ext3 and ext4 images

Change-Id: I63b36bfa0036419df92a60a1f8f7b0a7e6b1b62e
Make LOCAL_SDK_VERSION current use correct framework.aidl

Change-Id: Ic9327378e22412f74f1a3311dfb5c7936670d6f8
http://b/issue?id=2666578
Merge (-sours) commit '8c1cbacfdff0763aea5a60e756d072dc6075add5' into oxygen_4.3

* commit '8c1cbacfdff0763aea5a60e756d072dc6075add5':
  Make LOCAL_SDK_VERSION current use correct framework.aidl
  build: Add support for ext3 and ext4 images
  Fix and enable JarJar in Java builds.
  Quiet the build a little more.