| commit | a2fcd056a9c72db1b97e3d05677a5cdc374ac616 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Wed Apr 27 21:20:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 27 21:20:57 2016 +0000 |
| tree | 7103b1ba62d9d3f6caf1e159cb5ade4752832c1b | |
| parent | eb7bb568d275325e5b7e7e7875c531a0d120578c [diff] | |
| parent | 58a252d1f0048c8b4188f6ea87d072cb3a686a50 [diff] |
Merge "resolve merge conflicts of 0d00d28 to nyc-dev" into nyc-dev am: 58a252d * commit '58a252d1f0048c8b4188f6ea87d072cb3a686a50': Adjust root path for translated content dirs on devsite builds. Change-Id: I0812cf024502b32259bd4431324e91d8fcf5e792