am 1f85b46b: am dca5fb9e: Merge "Enable SQLite configuration to be set with system properties." into jb-dev
am 1f85b46b: am dca5fb9e: Merge "Enable SQLite configuration to be set with system properties." into jb-dev

* commit '1f85b46b3f4764f13c79203564ccb56be7cdf603':
  Enable SQLite configuration to be set with system properties.

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