Daniel Sandler cb629f3800 am 4365d066: Merge "Remove line3 in big notification unless there\'s text to show." into jb-dev ...

* commit '4365d066e8beed17b61ba51c728d60a9baa499be':
  Remove line3 in big notification unless there's text to show.

2012-06-13 18:03:40 -07:00

..

java

am 4365d066: Merge "Remove line3 in big notification unless there\'s text to show." into jb-dev

2012-06-13 18:03:40 -07:00

jni

am fdcac45b: Merge "Print extended SQLite error code." into jb-dev

2012-06-12 16:09:34 -07:00

res

am 4365d066: Merge "Remove line3 in big notification unless there\'s text to show." into jb-dev

2012-06-13 18:03:40 -07:00

tests

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

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