tree 01a61327343c90f434b5e85c6305aa2f7ac3ac7a
parent de5e5d7141e7816a006e9a890bb68fc2d6581e0e
parent 8464d7decb34a3044e92b4085f1bbaafb51410e8
author Chong Zhang <chz@google.com> 1428699098 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428699099 +0000

Merge "HLS: allow down switch during prepare"