| tag | fb423a5ef3c2f2222ea1562eb9accb78e4e53e6a | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Wed May 17 17:55:07 2017 -0700 |
| object | b7147432cf0d58533bd21fe594d0be1d153f91a6 |
Android N IOT Preview 4 (NIH40E)
| commit | b7147432cf0d58533bd21fe594d0be1d153f91a6 | [log] [tgz] |
|---|---|---|
| author | Brian Wood <brian.j.wood@intel.com> | Mon Feb 27 16:58:40 2017 -0800 |
| committer | Brian Wood <brian.j.wood@intel.com> | Tue Feb 28 15:35:14 2017 -0800 |
| tree | aec042cd9c91432c09285381c5d5af85072975c9 | |
| parent | ce7cfcfa1251122880d34fae7259309b64a78434 [diff] | |
| parent | ec55e7c2bf49a426b6f8204505bd267c77554d37 [diff] |
Merge remote-tracking branch 'remotes/origin/brillo/linux-3.10.y' into Brillo-20170221-3.10_kernel Conflicts: crypto/blkcipher.c drivers/platform/x86/intel_scu_ipcutil.c drivers/usb/gadget/u_ether.c fs/ext4/extents.c net/bluetooth/sco.c net/wireless/scan.c Change-Id: Iaea6d22acb3da6b0477d71cf546858d35295e3d2