| commit | c7615f868be062579df35bb3d29a3e09ba8de502 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Jun 27 16:24:21 2016 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Mon Jun 27 16:26:13 2016 -0700 |
| tree | a203be648eaf785d09be1a5013e74e0566c9b47a | |
| parent | 861686c9e663e212e40b3ec633b9d4d0aed310c0 [diff] | |
| parent | f037c899ae705307356f0962a9c857c245c39454 [diff] |
Merge branch android-tegra-3.10 into android-tegra-flounder-3.10 9783aac UPSTREAM: staging: android: lowmemorykiller: neglect swap cached pages in other_file 76fc453 UPSTREAM: staging: android: lowmemorykiller: set TIF_MEMDIE before send kill sig Signed-off-by: Mark Salyzyn <salyzyn@google.com> Bug: 26095201 Bug: 29389829 Change-Id: Ib2ee2d4bc15a420553a70313be4ea4b15490009d