| commit | d964e4522714db62078fe61a44d7b969cb758a7a | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Oct 24 10:24:03 2017 -0700 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Oct 27 03:22:11 2017 +0000 |
| tree | 16cc6c41891560eeb68228964f3656d3dd48a9c6 | |
| parent | 76959ad15b2464dfbb137c64ecbbef2089fb528e [diff] |
Fix String Import into oc-dr1-release for November EMR oc-dr1-dev version had conflicts in res/values-gu/strings.xml res/values-hi/strings.xml res/values-ml/strings.xml res/values-mr/strings.xml res/values-uz/strings.xml Which have been resolved in favor of the version from the ag/3125918 (cherry picked from commit 3982092821434a95cfdd39965c6dab1d3c41cbc1) Change-Id: Ic838ec5a476ba797020f3525f92e33eca413a753