]> git.saurik.com Git - android/aapt.git/commit
am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
authorXavier Ducrohet <xav@android.com>
Mon, 28 Feb 2011 18:10:38 +0000 (10:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Feb 2011 18:10:38 +0000 (10:10 -0800)
commita53501b590b538cb31aa46afbe7e255f255362d9
treecf93a866d25c97781c4220389b976b42a7a07dce
parent58bf69c5880140bd7a2138467667ea8a0e6fe6e8
parent3acf3fd9b37b2d02c0457ea4c5b1049b9a0fcf9b
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.
Resource.cpp