[androidsdk-tools] 04/06: Merge tag 'upstream/22.2+git20130830_92d25d6'

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository androidsdk-tools.

commit ac8a8bb60f49c120a7505ae278507b3d9ee5e03d
Merge: 1b2e981 a83cafb
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Sep 7 16:53:49 2013 +0200

    Merge tag 'upstream/22.2+git20130830_92d25d6'
    
    Upstream version 22.2+git20130830~92d25d6

 common/src/main/java/com/android/SdkConstants.java |  131 +++++++--
 .../main/java/com/android/utils}/ArrayUtils.java   |    2 +-
 .../main/java/com/android/utils/HtmlBuilder.java   |  309 ++++++++++++++++++++
 .../main/java/com/android/utils}/SparseArray.java  |    2 +-
 .../java/com/android/utils}/SparseIntArray.java    |    2 +-
 .../main/java/com/android/xml/AndroidManifest.java |   27 ++
 ddmlib/.settings/org.eclipse.jdt.core.prefs        |    6 +-
 .../main/java/com/android/ddmlib/AdbHelper.java    |   38 ++-
 .../src/main/java/com/android/ddmlib/Client.java   |   73 +++--
 .../main/java/com/android/ddmlib/ClientData.java   |   12 +-
 .../src/main/java/com/android/ddmlib/Device.java   |    9 +
 .../java/com/android/ddmlib/HandleProfiling.java   |   56 +++-
 .../src/main/java/com/android/ddmlib/IDevice.java  |   49 +---
 .../com/android/ddmlib/IShellEnabledDevice.java    |   65 ++++
 .../com/android/ddmlib/NativeAllocationInfo.java   |   41 +--
 .../java/com/android/ddmlib/TimeoutException.java  |   15 +
 .../testrunner/IRemoteAndroidTestRunner.java       |   15 +-
 .../ddmlib/testrunner/RemoteAndroidTestRunner.java |   31 +-
 ddms/app/.settings/org.eclipse.jdt.core.prefs      |    6 +-
 ddms/app/ddms.iml                                  |   18 ++
 ddms/app/etc/ddms.bat                              |   18 +-
 .../src/main/java/com/android/ddms/UIThread.java   |    5 +-
 ddms/ddmuilib/.settings/org.eclipse.jdt.core.prefs |    6 +-
 ddms/ddmuilib/ddmuilib.iml                         |   22 ++
 .../java/com/android/ddmuilib/DevicePanel.java     |   57 +++-
 .../java/com/android/ddmuilib/SysinfoPanel.java    |  135 +++++----
 .../ddmuilib/heap/NativeDiffAllocationInfo.java    |   67 +++++
 .../ddmuilib/heap/NativeHeapDiffSnapshot.java      |   39 ++-
 .../com/android/ddmuilib/heap/NativeHeapPanel.java |   49 ++--
 .../ddmuilib/heap/NativeHeapProviderByLibrary.java |    3 +
 .../ddmuilib/heap/NativeSymbolResolverTask.java    |    8 +-
 .../ddmuilib/vmtrace/VmTraceOptionsDialog.java     |  145 +++++++++
 .../app/.settings/org.eclipse.jdt.core.prefs       |    6 +-
 hierarchyviewer2/app/etc/hierarchyviewer.bat       |   18 +-
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 .../device/DeviceConnection.java                   |    9 +-
 sdklib/.settings/org.eclipse.jdt.core.prefs        |    6 +-
 .../sdkuilib/.settings/org.eclipse.jdt.core.prefs  |    6 +-
 sdkmanager/sdkuilib/sdkuilib.iml                   |   20 ++
 .../repository/core/PackagesDiffLogic.java         |    2 +-
 .../internal/repository/icons/accept_icon16.png    |  Bin 253 -> 3277 bytes
 .../internal/repository/icons/addon_pkg_16.png     |  Bin 539 -> 529 bytes
 .../internal/repository/icons/buildtool_pkg_16.png |  Bin 453 -> 425 bytes
 .../repository/icons/devman_generic_16.png         |  Bin 269 -> 2906 bytes
 .../repository/icons/devman_manufacturer_16.png    |  Bin 269 -> 2906 bytes
 .../internal/repository/icons/devman_user_16.png   |  Bin 269 -> 272 bytes
 .../internal/repository/icons/doc_pkg_16.png       |  Bin 296 -> 290 bytes
 .../internal/repository/icons/extra_pkg_16.png     |  Bin 428 -> 540 bytes
 .../internal/repository/icons/log_off_16.png       |  Bin 236 -> 1218 bytes
 .../internal/repository/icons/log_on_16.png        |  Bin 311 -> 468 bytes
 .../internal/repository/icons/pkg_incompat_16.png  |  Bin 454 -> 409 bytes
 .../internal/repository/icons/pkg_installed_16.png |  Bin 356 -> 563 bytes
 .../internal/repository/icons/pkg_new_16.png       |  Bin 299 -> 262 bytes
 .../internal/repository/icons/pkg_update_16.png    |  Bin 296 -> 553 bytes
 .../internal/repository/icons/pkgcat_16.png        |  Bin 388 -> 1352 bytes
 .../internal/repository/icons/platform_pkg_16.png  |  Bin 460 -> 2981 bytes
 .../repository/icons/platformtool_pkg_16.png       |  Bin 453 -> 393 bytes
 .../internal/repository/icons/reject_icon16.png    |  Bin 317 -> 3367 bytes
 .../internal/repository/icons/sample_pkg_16.png    |  Bin 433 -> 3188 bytes
 .../internal/repository/icons/source_pkg_16.png    |  Bin 234 -> 466 bytes
 .../internal/repository/icons/status_ok_16.png     |  Bin 264 -> 3277 bytes
 .../internal/repository/icons/stop_disabled_16.png |  Bin 321 -> 809 bytes
 .../internal/repository/icons/stop_enabled_16.png  |  Bin 327 -> 642 bytes
 .../internal/repository/icons/sysimg_pkg_16.png    |  Bin 485 -> 1145 bytes
 .../internal/repository/icons/tool_pkg_16.png      |  Bin 188 -> 393 bytes
 .../internal/repository/icons/unknown_icon16.png   |  Bin 265 -> 453 bytes
 .../internal/widgets/AvdCreationDialog.java        |  116 +++++---
 .../repository/ui/MockPackagesPageImpl.java        |    2 +-
 .../repository/ui/SdkManagerUpgradeTest.java       |   10 +-
 sdkstats/.settings/org.eclipse.jdt.core.prefs      |    6 +-
 sdkstats/sdkstats.iml                              |   19 ++
 swtmenubar/.settings/README.txt                    |    2 +
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 swtmenubar/swtmenubar.iml                          |   17 ++
 traceview/.classpath                               |    2 +-
 traceview/.settings/org.eclipse.jdt.core.prefs     |    6 +-
 traceview/etc/traceview.bat                        |   18 +-
 traceview/traceview.iml                            |   19 ++
 .../.settings/org.eclipse.jdt.core.prefs           |    6 +-
 uiautomatorviewer/etc/uiautomatorviewer.bat        |   18 +-
 80 files changed, 1444 insertions(+), 337 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/androidsdk-tools.git