tree 4ffe3687ac6beb6124362d1c08b9c5d8509861d8
parent 59be74fcc7f9118a3b93476275d0e0a8e906e8ef
author Ed Tam <etam@google.com> 1395180674 -0700
committer Ed Tam <etam@google.com> 1395181820 -0700

flo: update prebuilt kernel - DO NOT MERGE

03485a6 staging: android: ashmem: Avoid deadlock with mmap/shrink
2e4946a deb: mdm: Implement RESET_CHARM in the ioctl function.

Bug: 13114122
Bug: 11679123

Change-Id: I1253da72daa529540f1223a26f524003128bd75c
Signed-off-by: Ed Tam <etam@google.com>