| commit | 9a98ffcbaa332902ed3f03c8d3c8021bf3b178f9 | [log] [tgz] |
|---|---|---|
| author | Jin Qian <jinqian@google.com> | Thu Sep 08 11:42:25 2016 -0700 |
| committer | Jin Qian <jinqian@google.com> | Thu Sep 08 11:43:08 2016 -0700 |
| tree | 0bf55fa9a0f39062e644d10a70310f4fa18a7c10 | |
| parent | aed4bf9c83494e1002d0044ae02d38eae0101616 [diff] | |
| parent | 27b9cfb99b547be7c09ac3efa2cb0474e5eb375c [diff] |
Merge branch 'android-3.4' into android-goldfish-3.4 27b9cfb tcp: Use supported random32 in pre-3.8 kernels 87b538d UPSTREAM: ALSA: timer: Fix race among timer ioctls 9bf715c ASoC: check for null function pointer for dummy device read/write dfc1f47 BACKPORT: Bluetooth: Fix potential NULL dereference in RFCOMM bind callback 9f69fb5 BACKPORT: tcp: make challenge acks less predictable Change-Id: I152b40af8eb89b3320ba4a37b4340555386a487f