| commit | 1ff496a75a116f77fa9cd6b90c6ac635e98e5669 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Mon Jul 25 16:36:20 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 25 16:36:20 2011 -0700 |
| tree | 330287f09a78c725253b0c9e5203dd5dee50b87a | |
| parent | e3f5edf9755ca2ffbb654389251a61b35a3d9901 [diff] | |
| parent | a17d454fd0d20d14cf1fbc09f0f296cb6cbb870b [diff] |
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"