commit | 331de5dd58b2115968d9fd2a9ce21a45db309d37 | [log] [tgz] |
---|---|---|
author | Gloria Wang <gwang@google.com> | Fri May 13 14:10:18 2011 -0700 |
committer | Gloria Wang <gwang@google.com> | Fri May 13 15:09:24 2011 -0700 |
tree | 73bb7b21147d1c2c22ffb9895747d25c7dc6b2a6 | |
parent | a8138732a01b92f0a40f72050b74a3bd4cf6d215 [diff] |
DO NOT MERGE For bug 4422428 Squashed commit of the following: commit ae2e13783db2284f40d3891e70e152dab941edfc Author: Gloria Wang <gwang@google.com> Date: Fri May 13 11:43:11 2011 -0700 Add one more DRM error code. For bug 4422428. Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6 commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2 Author: Gloria Wang <gwang@google.com> Date: Fri Apr 29 10:44:46 2011 -0700 Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394 Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18