| commit | 86f2721e961863adfb58604c41bb70a232112e2c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 21 17:27:54 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 17:27:54 2015 +0000 |
| tree | 0f705c1d97a224af03e1f875f78f1e941003e852 | |
| parent | 221e22d0277a848504df0169dc40ec1a2fe244df [diff] | |
| parent | c6fe063ddf113a5551f3bfe6a1f1631c775d9cc6 [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 am: c6fe063ddf * commit 'c6fe063ddf113a5551f3bfe6a1f1631c775d9cc6': Import translations. DO NOT MERGE