Bart Sears 7dbf63665b am ae232842: am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev ...

* commit 'ae232842c86f108da5a73c047eff5a09e9c9c222':
  Fix native crash while saving a panorama.

2012-10-17 10:28:52 -07:00

..

java

am ef512f03: am cccf85c2: am 8e614501: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev

2012-10-16 19:30:18 -07:00

jni

am ae232842: am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev

2012-10-17 10:28:52 -07:00

res

Merge "Import translations. DO NOT MERGE"

2012-10-16 21:12:52 -07:00

tests

Fix build, only invalidate when creating user.

2012-10-10 00:01:26 -07:00