Amith Yamasani 4a04f11b43 am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1 ...

* commit '7e978441eeed9defb1031cc17c2857cf06cf825a':
  Use more padding on the sides for SearchView

2011-03-15 12:50:35 -07:00

..

config

…

java

am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown."

2011-03-15 12:05:40 -07:00

jni

am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread

2011-03-15 11:03:42 -07:00

res

am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1

2011-03-15 12:50:35 -07:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00