| commit | a5433a82cc86f4d6daa571f1a102626563595d0d | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Wed May 04 19:07:10 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 04 19:07:10 2016 +0000 |
| tree | fc0e58697d79db42fd9ffc9e2cacbfcccc441a3f | |
| parent | 6fa789211e0d2d0a488bdade34f19b5ea6e5923b [diff] | |
| parent | 5695ff4eea3bb99f41ba4942d3ab4622f6c0f5d7 [diff] |
resolve merge conflicts of f1d0fda to nyc-mr1-dev-plus-aosp am: 5695ff4eea * commit '5695ff4eea3bb99f41ba4942d3ab4622f6c0f5d7': GLConsumer: add build-time disable of gpu protected content Change-Id: Iae3ac91d3b29bbea9bd9d7eb453e2429f88c684c