OSDN Git Service

Merge "DrmInitData: prevent public constructor access" into nyc-dev
authorRobert Shih <robertshih@google.com>
Wed, 6 Apr 2016 17:17:47 +0000 (17:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Apr 2016 17:17:47 +0000 (17:17 +0000)
commitdd9c91d2bafb255f6ec91e257166c6bfbcc4651a
treec90419154485bf3faa7e9d837645999979c4217b
parent779afeeebb16639e9fd605296c2f450cd57b1396
parent696dc4d8df457d9321038f4b7c6f2c8f44f1ee0f
Merge "DrmInitData: prevent public constructor access" into nyc-dev
am: 696dc4d

* commit '696dc4d8df457d9321038f4b7c6f2c8f44f1ee0f':
  DrmInitData: prevent public constructor access

Change-Id: I518a109df2c4f071c5804163bf518208e6425e8b