commit | 8c24e96437234907ab230b9117611afd44e78939 | [log] [tgz] |
---|---|---|
author | Shruthi Krishna <skrish@codeaurora.org> | Mon Jan 05 18:45:00 2015 -0800 |
committer | Shruthi Krishna <skrish@codeaurora.org> | Tue Jan 06 12:01:46 2015 -0800 |
tree | d797f2bd26be9451cdb33042fe7e25ed434a0133 | |
parent | 61a7d131adcd58f6cf93615e513477edc099753f [diff] | |
parent | 1ae9de5534ad43714e1337d510507458ffa09aaa [diff] |
Merge tag 'android-5.0.2_r1' into merge_branch Android 5.0.2 release 1 * tag 'android-5.0.2_r1': flo: increase vmalloc size by 100MB (240MB-->340MB) flo: Disable diag device in normal mode. Change-Id: I94aefd438bd26fdf68e9eacdfe73eed43ef6ab70