| commit | 392d62203b025f73a2c0009c43f5388963ff6b40 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jun 13 10:32:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 13 10:32:14 2014 +0000 |
| tree | 9a80f902d9854437102b313aae6483e8321a2ee6 | |
| parent | b6be7f22a82ee3bad8bcc709d21e72fc4727da09 [diff] | |
| parent | 8b8e5d45928aed8592d321fe55f560e35a4fece8 [diff] |
am 8b8e5d45: (-s ours) resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aosp * commit '8b8e5d45928aed8592d321fe55f560e35a4fece8': Update OMX messages for 64 bit