OSDN Git Service

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

* commit 'b4a50745f2833cfb73c05586fa9f9b63c0dc1629':
  DO NOT MERGE Remove extra fragment in captioning preferences