OSDN Git Service

Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-dev
authorAlan Viverette <alanv@google.com>
Thu, 12 Sep 2013 18:23:34 +0000 (18:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 Sep 2013 18:23:34 +0000 (18:23 +0000)

Trivial merge