merge from kraken-plus-aosp

Change-Id: Ice8381ca0386c01253be0fa6f9f91b993cac500d
This commit is contained in:
Jean-Baptiste Queru
2010-04-06 16:38:00 -07:00

Diff Content Not Available