Dan Morrill 26cee9f355 am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev ...

* commit '466bd636812684aeb8161f144597cc3b3ed39078':
  New method returning user metadata.

2012-09-21 17:46:29 -07:00

..

java

am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev

2012-09-21 17:46:29 -07:00

jni

am 3034d451: Merge "Fix for native crash on image decode OOM" into jb-mr1-dev

2012-09-21 17:44:54 -07:00

res

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

2012-09-21 15:31:08 -07:00

tests

Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev

2012-09-20 15:35:00 -07:00