commit | f6340b43ca6f5dbf1dde13544c316cebb8877d91 | [log] [tgz] |
---|---|---|
author | Jin Qian <jinqian@google.com> | Wed Nov 15 12:25:21 2017 -0800 |
committer | Jin Qian <jinqian@google.com> | Wed Nov 15 12:25:21 2017 -0800 |
tree | b548c2f77936368a00b66d290e1fbf87c35fb90a | |
parent | 401e41c4bc687173c54b5b0b08669bbbf9f49d71 [diff] | |
parent | 8361f193a7e6c955295357180a29c5b393d8fbba [diff] |
Merge branch 'android-3.10' into android-goldfish-3.10 8361f193a7e6 BACKPORT: xfrm: Clear sk_dst_cache when applying per-socket policy. a72942bb4922 BACKPORT: ALSA: seq: Fix use-after-free at creating a port Change-Id: I280ed784bad9d794abb200a5e1cdbda832ddc91d