commit | a74da813ec622822c8bb8b4524439c81e8b90dfa | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Tue Mar 11 02:15:27 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 11 02:15:27 2014 +0000 |
tree | 6c04313e38e2afa737c40c9bdea610055ea49472 | |
parent | a8e634ca5367dde80873a0b7643e27284db56336 [diff] | |
parent | d43d5becb359cfdd5e30f691724739ab216011f0 [diff] |
am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev * commit 'd43d5becb359cfdd5e30f691724739ab216011f0': DO NOT MERGE Remove extra fragment in captioning preferences