| commit | d19391cc282ffadef691933d51f6e09b114b2954 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 21 18:03:46 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 18:03:46 2015 +0000 |
| tree | dc77f53e5b185a9b4b3cf5f35dbac281c754f200 | |
| parent | ef40d8360c62ac8a0af488a341452cc1b55e863d [diff] | |
| parent | 86f2721e961863adfb58604c41bb70a232112e2c [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 am: 86f2721e96 * commit '86f2721e961863adfb58604c41bb70a232112e2c': Import translations. DO NOT MERGE