OSDN Git Service

Merge "Fix for 5088341 Security settings: String changes related to renaming "Timeout...
authorClaudia de Veaux <deveaux@google.com>
Tue, 9 Aug 2011 18:07:13 +0000 (11:07 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 9 Aug 2011 18:07:13 +0000 (11:07 -0700)

Trivial merge