Gilles Debunne f9bb1cd1fc resolved conflicts for merge of fb729202 to master ...

Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0

2011-12-06 15:57:47 -08:00

..

java

resolved conflicts for merge of fb729202 to master

2011-12-06 15:57:47 -08:00

jni

Merge "Add a new class to receive vsync events."

2011-12-05 21:19:41 -08:00

res

Merge "Import revised translations. DO NOT MERGE" into ics-mr1

2011-12-06 10:34:41 -08:00

tests

am 96f660f4: am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

2011-12-05 16:32:59 -08:00