Merge remote-tracking branch 'origin/stable' into 5.3
authorSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 16:19:53 +0000 (18:19 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 16:19:53 +0000 (18:19 +0200)
commitf1536d179ade768923de91e53c87fd02ad87fc8a
tree4491f8069db66b43cf7d0503ddbf25308f6c9f43
parent17ee404f2678684674b9c5c0c523602953146e37
parent098e09c1ce436eb40f9b9f2f0b8c186d20d7627d
Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: Id783915b0139a90ecfb99f8298b1ff5cf506a1dd