Merge commit '7a1192ff54e3e1cfc00cc416b5f5de2ec3422fc0' * commit '7a1192ff54e3e1cfc00cc416b5f5de2ec3422fc0': Add API level 7.
Merge commit '7a1192ff54e3e1cfc00cc416b5f5de2ec3422fc0' * commit '7a1192ff54e3e1cfc00cc416b5f5de2ec3422fc0': Add API level 7.