OSDN Git Service

Merge "Add maximum time-out to sync operation" into lmp-dev
authorGeorgi Nikolov <geonik@google.com>
Tue, 26 Aug 2014 18:16:53 +0000 (18:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 26 Aug 2014 18:16:54 +0000 (18:16 +0000)

Trivial merge