Nick Pelly 666fa84e66 am 46848574: Merge "NFC API updates." ...

* commit '468485747970d9842d94e1d292fe4cced701cad2':
  NFC API updates.

2011-08-31 13:26:23 -07:00

..

java

am 46848574: Merge "NFC API updates."

2011-08-31 13:26:23 -07:00

jni

am 9d4bc852: Merge "Fix input channel leak. Bug: 5156144"

2011-08-31 13:03:26 -07:00

res

am ac73e4bb: Merge "Fix bug 5220390 - action bar title metrics"

2011-08-31 11:43:28 -07:00

tests

Merge "Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL"

2011-08-26 14:05:09 -07:00