| commit | 41759234f07d349a3ec9b0d3d660eb0086c1988b | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Jan 22 19:58:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 22 19:58:04 2015 +0000 |
| tree | 81b81a31906702419cdf7818ddbf44a5d03df2d8 | |
| parent | cf8fee479befa0a414f5d2992cee690a01723b1c [diff] | |
| parent | 675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8 [diff] |
am 675a726f: resolved conflicts for merge of 8f5fc9e2 to lmp-mr1-dev-plus-aosp * commit '675a726fe4ca70beb1ecccb8c5f78dcc8f65cac8': Add ro.product.locale