Tom Taylor f0108cda21 resolved conflicts for merge of ad2fa35d to master ...

Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90

2009-12-22 10:11:55 -08:00

..

config

donut snapshot

2009-05-20 11:28:04 -07:00

java

resolved conflicts for merge of ad2fa35d to master

2009-12-22 10:11:55 -08:00

jni

am c4978805: merge from open-source master

2009-12-21 15:52:57 -08:00

res

Don't perform app transition of the app is not currently visible.

2009-12-21 15:26:51 -08:00