| commit | 3d25c15683fdc14fb0fdcc841e12e4eb785f682d | [log] [tgz] |
|---|---|---|
| author | David Hays <dhays90@gmail.com> | Tue Aug 12 22:36:42 2014 -0700 |
| committer | Ethan Chen <intervigil@gmail.com> | Tue Aug 12 22:36:59 2014 -0700 |
| tree | 8e1e207c0f5afce195a7c601861b0211c353add6 | |
| parent | 2387bc62673f4e96b833b5f103e40127d01d6de5 [diff] | |
| parent | c201ba589e918b7edb49efff5868664bc2714aa8 [diff] |
Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.42' into cm-11.0 Conflicts: drivers/media/video/msm/msm_vpe.c Change-Id: I68cc48a1dc3d2ed71c7b013aeb10be7748812769