| commit | 305013b1638e72712464f122435ff350aef5a6be | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Thu Mar 13 18:08:54 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 18:08:54 2014 +0000 |
| tree | 71819434c1e7560b0be51abc7a7887176d5b1adb | |
| parent | 7a5911a96d158567bac1e892aee813af1b563a46 [diff] | |
| parent | b4a50745f2833cfb73c05586fa9f9b63c0dc1629 [diff] |
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