commit | dfc6cdf7930f889739690217d58797cbf5916c92 | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Tue Jan 31 08:58:51 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 31 08:58:51 2012 -0800 |
tree | 377c462d35c4bda59a2168b9d206ca06d9540f23 | |
parent | 658310548bd67dc314123d3a5d2e1dd7f8d92880 [diff] | |
parent | 123ffc1fa40749dd2f2eef94fa1ab0306604b1ae [diff] |
am 123ffc1f: am 34260ad7: Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1 * commit '123ffc1fa40749dd2f2eef94fa1ab0306604b1ae': docs: fix locale name; South Africa is local en_ZA external issue 23133