am 64b1e85c: (-s ours) am 1fed4884: am 559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)

Merge commit '64b1e85ce910c4282cc5ca94f800f6103ace2d0b'

* commit '64b1e85ce910c4282cc5ca94f800f6103ace2d0b':
  Move to 1.6_r2 (DO NOT MERGE)
This commit is contained in:
Xavier Ducrohet
2009-10-01 11:46:36 -07:00
committed by Android Git Automerger

Diff Content Not Available