commit | 39b98c830a20402fc8474f85d51a585254aa7e6e | [log] [tgz] |
---|---|---|
author | Sridhar Gujje <sgujje@codeaurora.org> | Mon Dec 08 14:37:00 2014 +0530 |
committer | Sridhar Gujje <sgujje@codeaurora.org> | Tue Dec 09 15:15:25 2014 +0530 |
tree | b318d58981ba5793c1c33d30ef2e5d4a821c4341 | |
parent | a649469c8ea2d26f4246d7ca9c7883d3e520b75c [diff] | |
parent | c6de663910836c814ee7d6b3583c5cabab26ba9a [diff] |
Merge commit 'c6de663910836c814ee7d6b3583c5cabab26ba9a' into remote AU_LINUX_ANDROID_LA.BR.1.2.1.05.00.00.029.013 merging to LA.BR.1 Conflicts: hal/msm8916/platform.c Change-Id: I9ecef3195c37ae6e1b3cd754b6ec9a0c2b0bd191