OSDN Git Service

Merge "am: Increase dropbox buffer size to 256KB (from 128KB)" into klp-dev
authorIgor Murashkin <iam@google.com>
Tue, 29 Oct 2013 21:20:53 +0000 (21:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 29 Oct 2013 21:20:54 +0000 (21:20 +0000)
commite5c1208ef9ef7d10b5bae6c82b9eb5a92da1244e
tree87bdccaf31a1b4877b358ea6e60b2fc20ac6e0c3
parent927d854ff4dc66edd22c109400233eb2d76dfce6
parent44d04aa0ace68e6164c5eb7b3536c0992aaf5a3a
Merge "am: Increase dropbox buffer size to 256KB (from 128KB)" into klp-dev
services/java/com/android/server/Watchdog.java
services/java/com/android/server/am/ActivityManagerService.java