| commit | 7e71c1ea12aecc0706f118aff9067d410034c229 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Fri Mar 14 10:02:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 10:02:44 2014 +0000 |
| tree | 1b252b6495e62dae7a3210cfbc19b2c41c13d41f | |
| parent | cc91f6ff662dbac9ae78c4b68c94e3210c4c876a [diff] | |
| parent | 305013b1638e72712464f122435ff350aef5a6be [diff] |
am 305013b1: (-s ours) am b4a50745: am c736f794: am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev * commit '305013b1638e72712464f122435ff350aef5a6be': DO NOT MERGE Remove extra fragment in captioning preferences