commit 97a0d98f9e019b03154df127d819c4c2a45a81dd
author Conley Owens <cco3@android.com> Wed May 08 14:19:10 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 08 14:19:10 2013 -0700
tree 47c98e6af6b973b005f7efb526defb7f5782286f
parent 9c1c837dcb55e8a9c4af756074425d14775feccc
parent ec1bec62a296146e6b7742ef8bda346b1923ea7c

am ec1bec62: Reconcile with tools_r22

* commit 'ec1bec62a296146e6b7742ef8bda346b1923ea7c':
  Update SDK prebuilts: ant-tasks after sdklib API change.
  Update SDK prebuilts: common.
  Update SDK prebuilts: sdkmanager command-line license.
  Update JAR option to specify which libs to keep.
  Update SDK prebuilts: sdklib, sdkuilib, sdkmanager.
  Update prebuilts script can now detect if JARs have actually changed.
  Update prebuilts.
  Update SDK prebuilts (sdkuilib, lint-check, sdk-common).
  Update script to update all prebuilts.
  Update SDKuilib prebuilt: missing icon for build-tool package.