Dianne Hackborn 40e5df95ff Merge "Make AtomicFile a public API. It's about time!" into jb-mr1-dev

2012-07-31 18:11:03 -07:00

..

java

Merge "Make AtomicFile a public API. It's about time!" into jb-mr1-dev

2012-07-31 18:11:03 -07:00

jni

Merge "Rename drawGeneralText to drawText" into jb-mr1-dev

2012-07-27 16:42:52 -07:00

res

Merge " Tentertively enable notification ime switcher" into jb-mr1-dev

2012-07-30 20:14:59 -07:00

tests

am 194da0b8: am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev

2012-07-31 12:36:35 -07:00