China has renewed Google's Internet content provider license, the search engine giant announced Friday.

"We are very pleased that the government has renewed our ICP license and we look forward to continuing to provide Web search and local products to our users in China," Google said in a statement.

The announcement comes several days after Google announced a hybrid approach to search in the region. To avoid losing its license in China, Google said it would stop completely re-directing all Google.cn traffic through its Hong Kong site and instead reinstate the Google.cn landing page. The search component is still an unfiltered option going through Google.com/hk, while other Google.cn services that have traditionally been unfiltered, like music and text translate, will be available via Google.cn.

This most recent conflict between China and Google dates back to January, when Google suddenly announced that it would stop censoring its search results in China. The company had discovered that attacks originating in China had unsuccessfully tried to access Google intellectual property as well as the Gmail accounts of several Chinese human rights activists.

After discussions with Chinese officials, Google followed through on that promise in March, when it started re-directing its Google.cn traffic to the unfiltered Google.com/hk.

That reportedly did not please Chinese officials, who told Google that their move was unfriendly, irresponsible, and would have consequences. Last week, Google said the Chinese found its Hong Kong re-direct option "unacceptable" and threatened to pull Google's license if a reasonable solution was not found.

To avoid going dark in China, Google implemented its hybrid approach, which has apparently been accepted by Chinese officials.