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