Commits
Jean-Baptiste Queru authored and Android Git Automerger committed cf67abbc48dM
am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp Merge commit '6ffee9bbba53700d33456261b986ac8a3f333b9e' * commit '6ffee9bbba53700d33456261b986ac8a3f333b9e': Revert "resolve conflicts"
Showing diff tod41b037c6b6