Commits
Xavier Ducrohet authored and Android Git Automerger committed 0b423bd5917M
am 59e699f1: (-s ours) am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. * commit '59e699f13db9a32f30108e25577685bb39b3dae4': Merge 6103e22c from honeycomb-mr1. do not merge.
Showing diff to59e699f13db