Christopher Tate 4c02cca213 am f5c0cf90: am bf7d2220: Merge "Don\'t back up / restore non-primary users\' data" into jb-mr1-dev ...

* commit 'f5c0cf90838ecb95893c9679fb5e352343fac12a':
  Don't back up / restore non-primary users' data

2012-08-13 18:02:52 -07:00

..

java

am f5c0cf90: am bf7d2220: Merge "Don\'t back up / restore non-primary users\' data" into jb-mr1-dev

2012-08-13 18:02:52 -07:00

jni

am af4fa8d7: am 8046b5e0: Merge "UsbRequest: set ByteBuffer.position() upon success." into jb-mr1-dev

2012-08-09 16:14:13 -07:00

res

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

2012-08-13 16:07:41 -07:00

tests

Tests for mapping android name to uid

2012-08-13 13:51:01 -07:00