OSDN Git Service

am c736f794: am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment...
authorAlan Viverette <alanv@google.com>
Thu, 13 Mar 2014 18:02:18 +0000 (18:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 18:02:18 +0000 (18:02 +0000)
commitb4a50745f2833cfb73c05586fa9f9b63c0dc1629
tree71819434c1e7560b0be51abc7a7887176d5b1adb
parent375545e2fe6da2c2ccae7239f444a92004213018
parentc736f794ac38b832b5ffde28502580a9b20b722b
am c736f794: am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev

* commit 'c736f794ac38b832b5ffde28502580a9b20b722b':
  DO NOT MERGE Remove extra fragment in captioning preferences
AndroidManifest.xml