From: Xavier Ducrohet <xav@android.com>
Date: Mon, 28 Feb 2011 17:16:38 +0000 (-0800)
Subject: am dff6b8e7: Merge "Add --non-constant-id to aapt."
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/3acf3fd9b37b2d02c0457ea4c5b1049b9a0fcf9b?hp=--cc

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

* 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.
---

3acf3fd9b37b2d02c0457ea4c5b1049b9a0fcf9b