tree f928f7836914a69b8544a519778f2d20b761a3b8
parent f63655e49fcccd922e8d5f61c67f58bd4a361211
parent 727dcc7e6b43902edaab88e7adfb1a8b88fd482b
author Alan Viverette <alanv@google.com> 1434391509 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1434391511 +0000

Merge "Obtain handler from context in CaptioningManager" into mnc-dev