Christopher Tate 066b036cd6 am f947930e: Merge "Document ContentProvider\'s API a bit more explicitly" ...

* commit 'f947930ed2e7aa4b7cc9f2d9aad0b25ef002c0c7':
  Document ContentProvider's API a bit more explicitly

2013-01-03 12:26:25 -08:00

..

java

am f947930e: Merge "Document ContentProvider\'s API a bit more explicitly"

2013-01-03 12:26:25 -08:00

jni

am af80cdd7: Merge "DdmServer: add controls for OpenGL tracing"

2013-01-02 09:14:06 -08:00

res

Import translations. DO NOT MERGE

2013-01-02 12:06:25 -08:00

tests

Move Observer test to servicetests

2012-12-11 11:15:25 -08:00