tree 80ed9ae3d7e43e7f57a12fe6a7571dc262ca4323
parent b283ac1ac6758aba907bfe56713d279e8aafd38b
parent 8f00151cbe693d52f3e233757c57fab3b6396d21
author Gloria Wang <gwang@google.com> 1311636980 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1311636980 -0700

Merge "Fix for bug 4371230. - Generate unique ID for each DrmManagerClient in native side - Fix the bug where multiple clients could use the same ID - Return the correct unique ID back to Java - Add a flag in the unique ID to separate native client and Java client"