Robert Greenwalt 1fee5ef1aa am d760beb7: am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev ...

* commit 'd760beb735538d61d78584722352a888629b670a':
  Bring up the ethernet interface when detected

2012-05-08 11:32:41 -07:00

..

java

am d760beb7: am 2321301f: Merge "Bring up the ethernet interface when detected" into jb-dev

2012-05-08 11:32:41 -07:00

jni

Merge "Fix crash when decoding bitmap" into jb-dev

2012-05-07 12:09:02 -07:00

res

Import translations. DO NOT MERGE

2012-05-07 12:55:55 -07:00

tests

am 5484e826: am 989c7532: Merge "fix expedited syncs. there were times when an expedited sync wouldn\'t correctly preempt non-expedited syncs" into jb-dev

2012-05-06 15:31:29 -07:00