diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-15 20:23:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-15 20:23:05 -0700 |
| commit | dabcbfe46dd202aa03d0b1580f568c4ba4fba915 (patch) | |
| tree | 8813fe8d61fd1cb9283e0048438ddaacc5dddf48 /api | |
| parent | 1da111fca47ab38db33d5987a375604e572cbb9c (diff) | |
| parent | 3e6c9ba6777cec3b3928ddb2b399c957735f7b06 (diff) | |
| download | frameworks_base-dabcbfe46dd202aa03d0b1580f568c4ba4fba915.zip frameworks_base-dabcbfe46dd202aa03d0b1580f568c4ba4fba915.tar.gz frameworks_base-dabcbfe46dd202aa03d0b1580f568c4ba4fba915.tar.bz2 | |
am 3e6c9ba6: am cb09dba0: am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev
* commit '3e6c9ba6777cec3b3928ddb2b399c957735f7b06':
Revert "Fix for bug 6050753."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index f8e31cb..288a268 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7094,7 +7094,7 @@ package android.content.res { method public int getIndexCount(); method public int getInt(int, int); method public int getInteger(int, int); - method public deprecated int getLayoutDimension(int, java.lang.String); + method public int getLayoutDimension(int, java.lang.String); method public int getLayoutDimension(int, int); method public java.lang.String getNonResourceString(int); method public java.lang.String getPositionDescription(); @@ -16149,7 +16149,7 @@ package android.os { public class Looper { method public void dump(android.util.Printer, java.lang.String); - method public static android.os.Looper getMainLooper(); + method public static synchronized android.os.Looper getMainLooper(); method public java.lang.Thread getThread(); method public static void loop(); method public static android.os.Looper myLooper(); |