1 files changed, 15 insertions, 3 deletions

diff --git a/ChangeLog.2 b/ChangeLog.2
index 3f31807049c..b4de90e228a 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -5,8 +5,8 @@
 
 2015-08-14  Michael Albinus  <michael.albinus@gmx.de>
 
-        * tramp-sh.el (tramp-sh-handle-file-acl): Do not redirect stderr
-        to /dev/null, this is done in `tramp-send-command-and-check'.
+        * lisp/net/tramp-sh.el (tramp-sh-handle-file-acl): Do not redirect
+        stderr to /dev/null, this is done in `tramp-send-command-and-check'.
 
 2015-08-14  Jürgen Hötzel  <juergen@archlinux.org>
 
@@ -45,6 +45,13 @@
         (uniquify-ask-about-buffer-names-p): Remove, unused (bug#21037)
         * lisp/uniquify.el: Remove redundant `:group's.
 
+2015-08-13  Jürgen Hötzel  <juergen@archlinux.org>
+
+        * lisp/net/tramp-adb.el
+        (tramp-adb-handle-directory-files-and-attributes): Make a copy of
+        result to prevent modification of the tramp-cache by side effects.
+        Use the correct cache key.
+
 2015-08-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         Make add_to_log varargs
@@ -234,6 +241,12 @@
         (perform-replace): Move the description of the format of `replacements' from
         the body's comment to the docstring.
 
+2015-08-11  Jürgen Hötzel  <juergen@archlinux.org>
+
+        * lisp/net/tramp-adb.el (tramp-adb-prompt): Match leading escape
+        sequence.  Recent adb version send initial escape sequences, even
+        when terminal type is set to TERM=dumb.
+
 2015-08-10  Stephen Leake  <stephen_leake@stephe-leake.org>
 
         Rewrite elisp--xref-find-definitions to handle many more cases; add tests.
@@ -455,7 +468,6 @@
         added for these exceptional cases, as well as one non exceptional
         base case.
 
-
 2015-08-07  Jürgen Hötzel  <juergen@archlinux.org>
 
         Improve error checking in tramp-adb.el