Geoff Mendal 86f2721e96 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

2015-10-21 17:27:54 +00:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2015-10-21 09:29:09 -07:00

CaptivePortalLogin

Import translations. DO NOT MERGE

2015-10-21 09:32:22 -07:00

DefaultContainerService

Import translations. DO NOT MERGE

2015-10-21 09:35:36 -07:00

DocumentsUI

Import translations. DO NOT MERGE

2015-10-21 09:39:05 -07:00

ExternalStorageProvider

Import translations. DO NOT MERGE

2015-10-21 09:42:17 -07:00

FakeOemFeatures

…

FusedLocation

Merge branch \'cw-e-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev

2015-10-21 17:06:03 +00:00

InputDevices

Import translations. DO NOT MERGE

2015-09-18 13:57:25 -07:00

Keyguard

am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev

2015-09-24 02:29:01 +00:00

PrintSpooler

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

services

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

SettingsLib

resolve merge conflicts of 57a5cba606 to cw-e-dev.

2015-10-20 17:23:23 +00:00

SettingsProvider

Import translations. DO NOT MERGE

2015-09-18 10:22:02 -07:00

SharedStorageBackup

…

Shell

Import translations. DO NOT MERGE

2015-09-18 14:06:53 -07:00

StatementService

…

SystemUI

Import translations. DO NOT MERGE

2015-10-21 05:14:07 -07:00

VpnDialogs

Import translations. DO NOT MERGE

2015-09-18 14:17:59 -07:00

WallpaperCropper

am 8b73003f: am ea288fd3: Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"

2015-08-26 14:37:27 +00:00

WAPPushManager

…