OSDN Git Service

resolved conflicts for merge of 9b7dba93 to eclair-mr2
authorMike Lockwood <lockwood@android.com>
Thu, 3 Dec 2009 00:57:33 +0000 (19:57 -0500)
committerMike Lockwood <lockwood@android.com>
Thu, 3 Dec 2009 00:57:33 +0000 (19:57 -0500)
commitf72fb68bf32014b075fe577c8495c2c8a86476a9
tree839f2a8a25c0a94a8ba841a881f63101d2ffa3a3
parent2d8b0c3f0fbc3c42063f4e790ca85b86c5d655f0
parent9b7dba936c24fa7959561ddf1a0c8ba4d2165782
resolved conflicts for merge of 9b7dba93 to eclair-mr2

Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59
services/java/com/android/server/NotificationManagerService.java