tree 911d816947d64fcca77c513f83a87259390ea72c
parent 23d41fb11de0a5acb12733f7cd8875ea06d99eb5
parent 69f80eebdba1c95437eb1add7e2d2f61d4ca8a75
author Chong Zhang <chz@google.com> 1431647702 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431647702 +0000

am 69f80eeb: am 84aea415: am 96a41a2b: (-s ours) am dbe6c320: HDCP: buffer over flow check -- DO NOT MERGE

* commit '69f80eebdba1c95437eb1add7e2d2f61d4ca8a75':
  HDCP: buffer over flow check -- DO NOT MERGE