| commit | c6fe063ddf113a5551f3bfe6a1f1631c775d9cc6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 21 17:06:03 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 17:06:03 2015 +0000 |
| tree | 6617ba7b3eebf35466835c25ecea28b9e3474f26 | |
| parent | 899d016e89daeccd8f1f5b15a5222f801570f283 [diff] | |
| parent | 84ab40cab243ac76a83c3d15478699998ba68236 [diff] |
Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev am: 84ab40cab2 * commit '84ab40cab243ac76a83c3d15478699998ba68236': Import translations. DO NOT MERGE