Commits
Xavier Ducrohet authored and Android Git Automerger committed 3d29a211acdM
am 68957a0d: (-s ours) am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. * commit '68957a0d7516c82b8cb4050f15294c663bf08338': Merge 67450db0 from honeycomb. Do not merge.
Showing diff tocc4d56f9ee0