Commits
Xavier Ducrohet authored and Android Git Automerger committed 01ce57f92f4M
am fc1bf925: resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp * commit 'fc1bf9256372018188468b8ba5163ac5dcc74f56': Merge c5aeac7f from honeycomb.
Showing diff tofc1bf925637