Dianne Hackborn 6892f1ec96 am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev ...

* commit '0f6471ace77387560988964ed0679f843bba6f1f':
  Fix issue #6641368: can't launch gallery

2012-06-12 12:41:36 -07:00

..

java

am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev

2012-06-12 12:41:36 -07:00

jni

am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev

2012-06-11 10:41:09 -07:00

res

am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev

2012-06-12 12:41:20 -07:00

tests

resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp

2012-06-08 13:47:46 -07:00