tree a2fab9c785f055c9962e565896d5e4a1bdadc769
parent 1649d91f781445a78ce09ed5500503fd96eb9113
parent ce57a7f35344e76689d30f45964d1e37b78280cb
author Xavier Ducrohet <xav@android.com> 1298916638 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298916638 -0800

am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."

* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.