Dianne Hackborn d31bf5948f am 00840827: am 40e5df95: Merge "Make AtomicFile a public API. It\'s about time!" into jb-mr1-dev ...

* commit '008408277933afb23a95e080b09eed07d2575eda':
  Make AtomicFile a public API.  It's about time!

2012-07-31 18:15:26 -07:00

..

java

am 00840827: am 40e5df95: Merge "Make AtomicFile a public API. It\'s about time!" into jb-mr1-dev

2012-07-31 18:15:26 -07:00

jni

Merge "Fix Time.parse and Time.parse3339 crashing bugs."

2012-07-30 08:03:02 -07:00

res

Revert "am a21a6075: Reconcile with jb-mr1-release"

2012-07-31 10:58:38 -07:00

tests

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

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