am ce286143: (-s ours) Formatting fix: ensure no double blank new lines between elements. DO NOT MERGE.

* commit 'ce286143d5a1fc448205f3c905a00de4dc943d9a':
  Formatting fix: ensure no double blank new lines between elements. DO NOT MERGE.
Add a preference to turn on/off auto monitoring logcat. DO NOT MERGE.

Change-Id: I30174344cd5909e3de773b30cac711dd4f609f87
am d55b705d: (-s ours) Add a preference to turn on/off auto monitoring logcat. DO NOT MERGE.

* commit 'd55b705d33316e05abfc23cec34708307a4d226e':
  Add a preference to turn on/off auto monitoring logcat. DO NOT MERGE.
SDK Manager: fix handling of source URLs

This changes how source URLs are handled. Packages
from different sources were previously treated as
separate if the packages were the same (e.g. same
platform API) but the source URLs were different.

Instead this checks the hostname+domain name of the URL
is different, as well as the type of the source (that
is a sdk repository vs addon repository).

Change-Id: I5ba133cd0dc984528bf696aef77d00cd9d31ed9c
Merge "SDK Manager: fix handling of source URLs"
SDK Manager: fix handling of source URLs. Do not merge.

This changes how source URLs are handled. Packages
from different sources were previously treated as
separate if the packages were the same (e.g. same
platform API) but the source URLs were different.

Instead this checks the hostname+domain name of the URL
is different, as well as the type of the source (that
is a sdk repository vs addon repository).

(cherry picked from commit d66d4b7804ce5585bed335168a0c7f3f178a11b0)

Change-Id: Ic127c4111e5028d467ad89c987c5f39cb8f8e8d7
am 68ce843e: (-s ours) SDK Manager: fix handling of source URLs. Do not merge.

* commit '68ce843e28c93465c48db84de09821347cdc8f6a':
  SDK Manager: fix handling of source URLs. Do not merge.
Merge "20542: Contextual prop menu doesn't work well for textStyle"
20542: Contextual prop menu doesn't work well for textStyle. DO NOT MERGE.

Change-Id: I6092924b63448b9700ebe5906fab87f11520e27f
am 6e805fb2: (-s ours) 20542: Contextual prop menu doesn\'t work well for textStyle. DO NOT MERGE.

* commit '6e805fb2b209a2d346fa561ad02e8f67de70684a':
  20542: Contextual prop menu doesn't work well for textStyle. DO NOT MERGE.
Fix NPE: for some properties, description was null.

See http://code.google.com/p/android/issues/detail?id=20447

Change-Id: I7db8f16b4027a9f4582c4a70bf8ad1c048ae7006
merge in ics-release history after reset to master
Fix Copy/Paste enablement

This changeset fixes a couple of cases where the Copy/Paste actions
would not be enabled:

* When switching active tabs
* After running some other actions

Change-Id: I03df6fa91641ce722cb7bac615fc73342c77f586
Model diff snapshot as a subtype of a regular snapshot.

Change-Id: Ic701255c586530214b51a1553b66aa60c6c7b538
Add support for importing saved heap data.

Change-Id: I8552af1754f5093dcdb156f7f81e3beef776835a
Merge "Fix Copy/Paste enablement"
Merge "Add support for importing saved heap data."
Minor refactor: keep sizes of snapshot ArrayList's in sync.

Change-Id: I30aef911df1146ff9a64c4d08c4371c2937d4e94
The overlay plugin has no src folder.

Change-Id: I48cc8c3e707d63a11320d84b84e62c2a60f28233
Add logging in ddms.

Change-Id: I42508186ea339de1d97f0de2e801e6152311881a