| commit | 5e3f9f481bf0d5f738f02ba56b35c7fb0bd8623f | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Mon Mar 23 22:40:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 22:40:10 2015 +0000 |
| tree | 48850f33184b22e8760dec79835bf064f986f749 | |
| parent | d9a0371bbfd2d85efa5bf462be4ad4c9d6e57cd7 [diff] | |
| parent | a39101d68eb9d4d6f810c868384e8e8346636b64 [diff] |
am a39101d6: am f02769d6: am 817e1ef4: Merge "Use define for drm property keys instead of defining as char pointers" * commit 'a39101d68eb9d4d6f810c868384e8e8346636b64':