| commit | ab2965eefef95a2eecfd54c12b0eb243162862e9 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Apr 19 14:42:22 2012 -0700 |
| committer | Colin Cross <ccross@android.com> | Thu Apr 19 14:42:22 2012 -0700 |
| tree | c947fdc158e144c2d060486b65d10ee67d254039 | |
| parent | a0ec4361e4539e30cf1c5de7ddfd2dadcd8e1595 [diff] | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 [diff] |
Merge commit 'v3.4-rc3' into android-3.4 Conflicts: drivers/staging/android/lowmemorykiller.c Change-Id: Ia3ffcfc702e28c4fce0e91b363f4afd5f1c40306