Dan Albert 6ae3fe184c Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master ...

am: c74dd7fcb1

* commit 'c74dd7fcb128e9a1465c1a91a91a851c3386a955':
  Use std::unique_ptr instead of UniquePtr.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE

2015-11-05 19:56:57 +00:00

..

BackupRestoreConfirmation

Import translations. DO NOT MERGE

2015-11-04 15:26:15 -08:00

CaptivePortalLogin

Import translations. DO NOT MERGE

2015-11-04 15:28:25 -08:00

DefaultContainerService

Import translations. DO NOT MERGE

2015-11-04 15:30:29 -08:00

DocumentsUI

Import translations. DO NOT MERGE

2015-11-04 15:32:37 -08:00

ExternalStorageProvider

Import translations. DO NOT MERGE

2015-11-04 15:34:55 -08:00

FakeOemFeatures

…

FusedLocation

Import translations. DO NOT MERGE

2015-11-04 15:36:55 -08:00

InputDevices

Merge "Add Workman keyboard layout"

2015-10-23 23:39:24 +00:00

Keyguard

Import translations. DO NOT MERGE

2015-10-26 12:02:09 -07:00

PrintSpooler

Import translations. DO NOT MERGE

2015-10-26 12:04:18 -07:00

services

resolved conflicts for a884d81e to stage-aosp-master

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

SettingsLib

Import translations. DO NOT MERGE

2015-11-04 11:51:55 -08:00

SettingsProvider

Import translations. DO NOT MERGE

2015-11-04 11:56:04 -08:00

SharedStorageBackup

…

Shell

Import translations. DO NOT MERGE

2015-10-26 12:06:21 -07:00

StatementService

…

SystemUI

Fixed a bug where the panel could get stuck closing am: b0e4f9e97e am: 157e60f7a2

2015-11-03 01:34:31 +00:00

VpnDialogs

Import translations. DO NOT MERGE

2015-10-21 10:19:50 -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

…