OSDN Git Service

Merge "Make sure we've finished loading settings before processing any reloads" into...
authorTom O'Neill <tomo@google.com>
Thu, 29 Aug 2013 21:22:54 +0000 (21:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Aug 2013 21:22:54 +0000 (21:22 +0000)

Trivial merge