am 26d513c6: merge from open-source master

Browse Source

Merge commit '26d513c6de7ed68179358a7eefbb258d0ea15824'

* commit '26d513c6de7ed68179358a7eefbb258d0ea15824':
  Fixes scroll/measure bug in EditText
  Fixed issue #4098: Ringtone#getTitle does not close its cursor.
  Fixed Android issue #2002: "Proximity alert detection logic is broken"

...

This commit is contained in:

Jean-Baptiste Queru

2009-10-14 16:20:14 -07:00

committed by Android Git Automerger

parent c9ce985dab 26d513c6de

commit e70ac348ad

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available