Jean-Baptiste Queru 9eb7a72253 resolved conflicts for merge of f7fb5331 to kraken ...

Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20

2010-05-17 13:50:32 -07:00

..

android

resolved conflicts for merge of f7fb5331 to kraken

2010-05-17 13:50:32 -07:00

com

am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic

2010-05-13 14:06:25 -07:00

jarjar-rules.txt

…

overview.html

…