Merge remote-tracking branch 'origin/stable' into 5.3
authorSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 16:20:39 +0000 (18:20 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 16:20:39 +0000 (18:20 +0200)
commitd67c98cb5d46e8d4bf72e57f3379e94b59b599fc
treeb9ce7231390313b4d467097b66c7c902f692fb22
parentf6845c203f00c90018c9d29579f890ea89dd2579
parent8deeceb12e68dd429ee53d6ef667f1ec79bce4de
Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: I44e51646f79c71b9ade6cbedd9e22bcae00833c8