| commit | f50f36061eb28aee4c4c3e75b04fb0c4999b315f | [log] [tgz] |
|---|---|---|
| author | Manish Kumar <manishku@codeaurora.org> | Thu Dec 04 11:00:18 2014 +0530 |
| committer | Manish Kumar <manishku@codeaurora.org> | Thu Dec 04 11:00:18 2014 +0530 |
| tree | 2dc673652074aea0a58c0a765967cd11863819da | |
| parent | cc6c6926dd4dec1b6c342e6dff034df54f368378 [diff] | |
| parent | 716d2d4611de4c203d8e7053a94f4fe6757439ad [diff] |
Merge commit '716d2d4611de4c203d8e7053a94f4fe6757439ad' into 121 Conflicts: hal/msm8916/platform.c Change-Id: I0211b22a2b4f53e446ce05b6157249ae011521f1