| commit | 6489d6f6547f5eb96d9a675ba68fa241ab699b42 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Thu Sep 12 11:26:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 12 11:26:22 2013 -0700 |
| tree | 802928f60284cc7132d34f8114b1b5bbe4fdb037 | |
| parent | 32aa0bfdd5984970e22da9676c5f59cc0bf9203e [diff] | |
| parent | 54fa990f6174542e1e7fbe77a75954fcd2f39983 [diff] |
am 54fa990f: Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-dev * commit '54fa990f6174542e1e7fbe77a75954fcd2f39983': Fix manifest entry for CAPTIONING_SETTINGS action