OSDN Git Service

Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev
authorAmith Yamasani <yamasani@google.com>
Thu, 17 Jul 2014 19:17:05 +0000 (19:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Jul 2014 02:40:09 +0000 (02:40 +0000)

Trivial merge