diff options
author | Marco Nelissen <marcone@google.com> | 2015-08-20 20:30:04 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 20:30:04 +0000 |
commit | f839b2a33c46f3520684f0a839760cca36a6b4c7 (patch) | |
tree | ae30f2a2cb0aa4aac6be286d42f30d6d97b32c79 /include/drm/DrmInfoRequest.h | |
parent | eb10ccbc9dcab8ec3ee22a1c2b2db4a673c6fdc2 (diff) | |
parent | 5aa887ef44238e9a727564fe9051933f8b42e399 (diff) | |
download | frameworks_av-f839b2a33c46f3520684f0a839760cca36a6b4c7.zip frameworks_av-f839b2a33c46f3520684f0a839760cca36a6b4c7.tar.gz frameworks_av-f839b2a33c46f3520684f0a839760cca36a6b4c7.tar.bz2 |
am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure
* commit '5aa887ef44238e9a727564fe9051933f8b42e399':
DO NOT MERGE Fail more gracefully on allocation failure
Diffstat (limited to 'include/drm/DrmInfoRequest.h')
0 files changed, 0 insertions, 0 deletions