OSDN Git Service

Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev
authorJohn Spurlock <jspurlock@google.com>
Tue, 28 Oct 2014 17:08:50 +0000 (17:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Oct 2014 17:08:51 +0000 (17:08 +0000)

Trivial merge