tree 485b152b97bf8321fdd223f35587bb4294672be8
parent 33e837a5deead6eb4042bb3266ef7a6cd987c883
parent 0aa8f39a3d35ef85dc7de0627e55ce01cb562aba
author Scott Main <smain@google.com> 1328027976 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1328027976 -0800

Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1