Adam Cohen 2e52c90b3f resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby ... Change-Id: I29aa5b37968b1ced81cdeb68a021db9310047252		2015-04-06 13:11:38 -07:00
..
task_open_enter.xml	Remove 300 ms start delay from app launch transition	2014-07-28 15:07:18 -07:00