Jean-Baptiste Queru 56b4a040ff Reconcile with jb-dev - do not merge
Change-Id: Ie0db4cf684b9f45cdf5a729f3b62adb2128a7c91
2012-10-03 15:29:09 -07:00
..
2012-09-19 06:19:11 +02:00
2010-04-05 09:47:36 -07:00
2010-04-05 09:47:36 -07:00