]> git.saurik.com Git - android/aapt.git/commitdiff
am dff6b8e7: Merge "Add --non-constant-id to aapt."
authorXavier Ducrohet <xav@android.com>
Mon, 28 Feb 2011 17:16:38 +0000 (09:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Feb 2011 17:16:38 +0000 (09:16 -0800)
* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
  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.


Trivial merge