OSDN Git Service
Android Build Merger (Role) [Thu, 5 May 2016 16:04:54 +0000 (16:04 +0000)]
Merge "Merge "Remove obsolete file" into nyc-dev am:
f91d66e8c0 am:
c2be342b10" into nyc-mr1-dev-plus-aosp
Rubin Xu [Thu, 5 May 2016 16:04:27 +0000 (16:04 +0000)]
Merge "Remove obsolete file" into nyc-dev am:
f91d66e8c0
am:
c2be342b10
* commit '
c2be342b1003b40c89700796617d9ede988a28a3':
Change-Id: I50f8f24a0ad3fc3f9051e3b8596b2ba97fed084a
Android Build Merger (Role) [Thu, 5 May 2016 16:02:21 +0000 (16:02 +0000)]
Merge "Merge "Remove obsolete file" into nyc-dev am:
f91d66e8c0 am:
c2be342b10" into nyc-mr1-dev-plus-aosp
Rubin Xu [Thu, 5 May 2016 16:01:51 +0000 (16:01 +0000)]
Merge "Remove obsolete file" into nyc-dev am:
f91d66e8c0
am:
c2be342b10
* commit '
c2be342b1003b40c89700796617d9ede988a28a3':
Remove obsolete file
Change-Id: I91c78030d4ff250381d4e910548b52bb6c927449
Rubin Xu [Thu, 5 May 2016 16:01:47 +0000 (16:01 +0000)]
Merge "Remove obsolete file" into nyc-dev am:
f91d66e8c0
am:
783ad2a814
* commit '
783ad2a8144d5e243791921a05fe621061837870':
Remove obsolete file
Change-Id: I565d14ae18bc6cfc68cb13ba754e6e1ae1b140c9
Rubin Xu [Thu, 5 May 2016 15:59:02 +0000 (15:59 +0000)]
Merge "Remove obsolete file" into nyc-dev
am:
f91d66e8c0
* commit '
f91d66e8c09119dcc06a5b48fe7785a8e255f15b':
Remove obsolete file
Change-Id: I319eacd1be0f76e4964cc0a974031a269440b858
Rubin Xu [Thu, 5 May 2016 15:59:01 +0000 (15:59 +0000)]
Merge "Remove obsolete file" into nyc-dev
am:
f91d66e8c0
* commit '
f91d66e8c09119dcc06a5b48fe7785a8e255f15b':
Remove obsolete file
Change-Id: I3ffc97d36895cccbae0a37e802c707d5869b7393
Jason Monk [Thu, 5 May 2016 15:56:04 +0000 (15:56 +0000)]
Merge "Fix QS crash with RTL rotate" into nyc-dev am:
4a19a2043c
am:
d27a5f26bb
* commit '
d27a5f26bbe8103122dfb23594d334f073d1edfe':
Change-Id: Ife1574c3adbf81dffcc36850d3e224be50b3eff0
Android Build Merger (Role) [Thu, 5 May 2016 15:55:00 +0000 (15:55 +0000)]
Merge "Merge "Fix QS crash with RTL rotate" into nyc-dev am:
4a19a2043c am:
705e67b3f8" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 5 May 2016 15:54:49 +0000 (15:54 +0000)]
Merge "Merge "Fix QS edit accessibility" into nyc-dev am:
c665a3d4e9 am:
ce8c21683d" into nyc-mr1-dev-plus-aosp
Jason Monk [Thu, 5 May 2016 15:54:19 +0000 (15:54 +0000)]
Merge "Fix QS crash with RTL rotate" into nyc-dev am:
4a19a2043c
am:
705e67b3f8
* commit '
705e67b3f8d4831321076ab5fc7f109c91afc6d3':
Fix QS crash with RTL rotate
Change-Id: I56a0e70ef8bf3aefde422ce4c0d71769940a3430
Rubin Xu [Thu, 5 May 2016 15:54:16 +0000 (15:54 +0000)]
Merge "Remove obsolete file" into nyc-dev
Jason Monk [Thu, 5 May 2016 15:54:15 +0000 (15:54 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev am:
c665a3d4e9
am:
ce8c21683d
* commit '
ce8c21683d31b9dfc48667db33bfdb22d656972d':
Change-Id: I13c0ee827e542affd9a941c99b1af286d9bbcb83
Android Build Merger (Role) [Thu, 5 May 2016 15:52:27 +0000 (15:52 +0000)]
Merge "Merge "Fix QS edit accessibility" into nyc-dev am:
c665a3d4e9 am:
ce8c21683d" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 5 May 2016 15:52:19 +0000 (15:52 +0000)]
Merge "Merge "Fix QS edit accessibility" into nyc-dev am:
c665a3d4e9 am:
09ed0764ed" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 5 May 2016 15:52:14 +0000 (15:52 +0000)]
Merge "Merge "QS Edit: announce exit/entrance" into nyc-dev am:
d27ed8b336 am:
a9922092e6" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 5 May 2016 15:52:08 +0000 (15:52 +0000)]
Merge "Merge "QS Edit: announce exit/entrance" into nyc-dev am:
d27ed8b336 am:
8717808f0c" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 5 May 2016 15:52:01 +0000 (15:52 +0000)]
Merge "Merge "Fix QS header settings + user visibilities" into nyc-dev am:
3f50a94e6c am:
faaee94e0f" into nyc-mr1-dev-plus-aosp
Jason Monk [Thu, 5 May 2016 15:51:23 +0000 (15:51 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev am:
c665a3d4e9
am:
ce8c21683d
* commit '
ce8c21683d31b9dfc48667db33bfdb22d656972d':
Fix QS edit accessibility
Change-Id: I5ed4f1ed340943633d77f28e54518fab3e2116ab
Jason Monk [Thu, 5 May 2016 15:51:19 +0000 (15:51 +0000)]
Merge "QS Edit: announce exit/entrance" into nyc-dev am:
d27ed8b336
am:
a9922092e6
* commit '
a9922092e64ab35bdda28bc2dba7e98f04e95fd7':
QS Edit: announce exit/entrance
Change-Id: I1e31a34f1098f68891ee9265b048926a26a45b63
Jason Monk [Thu, 5 May 2016 15:51:17 +0000 (15:51 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev am:
c665a3d4e9
am:
09ed0764ed
* commit '
09ed0764ed7ddbd642d8227bb2ce9131fd38eb1b':
Fix QS edit accessibility
Change-Id: I70c0e11013655ae9b997368deba2e435ce200dac
Jason Monk [Thu, 5 May 2016 15:51:14 +0000 (15:51 +0000)]
Merge "Fix QS header settings + user visibilities" into nyc-dev am:
3f50a94e6c
am:
faaee94e0f
* commit '
faaee94e0fda75d53d1309f8f6fe825ce9fd64f9':
Fix QS header settings + user visibilities
Change-Id: I50905c1e21a4b61f426718f646dd4db7ccdc4611
Jason Monk [Thu, 5 May 2016 15:51:13 +0000 (15:51 +0000)]
Merge "QS Edit: announce exit/entrance" into nyc-dev am:
d27ed8b336
am:
8717808f0c
* commit '
8717808f0c9c8586ab906f10ef96803f41823a16':
QS Edit: announce exit/entrance
Change-Id: I83ce2dfb68bb950df873136d01844cad49c88f64
Jason Monk [Thu, 5 May 2016 15:51:10 +0000 (15:51 +0000)]
Merge "Fix QS header settings + user visibilities" into nyc-dev am:
3f50a94e6c
am:
27461881b8
* commit '
27461881b82d164a8f185a449a1394a5f4e1d5de':
Fix QS header settings + user visibilities
Change-Id: If5bb7eb96a8b06c10eae0e26218790a8688c1460
Jason Monk [Thu, 5 May 2016 15:51:02 +0000 (15:51 +0000)]
Merge "Fix QS crash with RTL rotate" into nyc-dev
am:
4a19a2043c
* commit '
4a19a2043c0b1d698154fbd66309b95e3b6f10f2':
Fix QS crash with RTL rotate
Change-Id: I1d5b7cf2566c4afa95084cc4dfc7cafc89c45d9a
Jason Monk [Thu, 5 May 2016 15:50:57 +0000 (15:50 +0000)]
Merge "Fix QS crash with RTL rotate" into nyc-dev
am:
4a19a2043c
* commit '
4a19a2043c0b1d698154fbd66309b95e3b6f10f2':
Fix QS crash with RTL rotate
Change-Id: I53b42f85cc1dd435fa1582c3435c5e6cf6ce1938
Jason Monk [Thu, 5 May 2016 15:45:52 +0000 (15:45 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev
am:
c665a3d4e9
* commit '
c665a3d4e9000623fb01694383b73a0eef8b5c4a':
Fix QS edit accessibility
Change-Id: I82a88749b676a42771bf9c51196e4dca5111c1ba
Jason Monk [Thu, 5 May 2016 15:45:48 +0000 (15:45 +0000)]
Merge "QS Edit: announce exit/entrance" into nyc-dev
am:
d27ed8b336
* commit '
d27ed8b3363a4ff24ada13fd093caecfc815d99c':
QS Edit: announce exit/entrance
Change-Id: I4c66cf0a76720198fca002aed88b4f2f108e66bc
Jason Monk [Thu, 5 May 2016 15:45:43 +0000 (15:45 +0000)]
Merge "Fix QS header settings + user visibilities" into nyc-dev
am:
3f50a94e6c
* commit '
3f50a94e6c5afff6814b88f59b59475616836e6c':
Fix QS header settings + user visibilities
Change-Id: I4644fecc16ee4f83c796fc6d30b0ad9646959560
Jason Monk [Thu, 5 May 2016 15:45:39 +0000 (15:45 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev
am:
c665a3d4e9
* commit '
c665a3d4e9000623fb01694383b73a0eef8b5c4a':
Fix QS edit accessibility
Change-Id: I12ac600f198c8ed44b3a66741a6959b27c061571
Jason Monk [Thu, 5 May 2016 15:45:37 +0000 (15:45 +0000)]
Merge "QS Edit: announce exit/entrance" into nyc-dev
am:
d27ed8b336
* commit '
d27ed8b3363a4ff24ada13fd093caecfc815d99c':
QS Edit: announce exit/entrance
Change-Id: Id78980817d0ce06c6bd140afd74b525d8f46dcd1
Jason Monk [Thu, 5 May 2016 15:45:34 +0000 (15:45 +0000)]
Merge "Fix QS header settings + user visibilities" into nyc-dev
am:
3f50a94e6c
* commit '
3f50a94e6c5afff6814b88f59b59475616836e6c':
Fix QS header settings + user visibilities
Change-Id: I3872dc0d928417a65ec011abb22860839bf0a17f
Rubin Xu [Thu, 5 May 2016 15:39:19 +0000 (16:39 +0100)]
Remove obsolete file
Bug:
27531824
Change-Id: Id6706f0ba6a68723704e58a7fbd8b529e3ec7970
Jason Monk [Thu, 5 May 2016 15:42:41 +0000 (15:42 +0000)]
Merge "Fix QS crash with RTL rotate" into nyc-dev
Jason Monk [Thu, 5 May 2016 15:41:32 +0000 (15:41 +0000)]
Merge "Fix QS edit accessibility" into nyc-dev
Jason Monk [Thu, 5 May 2016 15:41:06 +0000 (15:41 +0000)]
Merge "QS Edit: announce exit/entrance" into nyc-dev
Jason Monk [Thu, 5 May 2016 15:40:32 +0000 (15:40 +0000)]
Merge "Fix QS header settings + user visibilities" into nyc-dev
Neil Fuller [Thu, 5 May 2016 15:22:59 +0000 (15:22 +0000)]
Merge changes from topic \'icu_cp_catchup\' am:
f6aabd95df am:
2b44297ff7
am:
5f236d9a4a
* commit '
5f236d9a4a40617f713b08c19c656c3d1e748879':
Track external/icu API changes for factory registration
ICU4J: Hide constants that can change between releases
Remove RawCollationKey/ByteArrayWrapper from the public API
Change-Id: I33b547bb9fe12459558033e6264f3795ec42cee7
Neil Fuller [Thu, 5 May 2016 15:18:37 +0000 (15:18 +0000)]
Merge changes from topic \'icu_cp_catchup\' am:
f6aabd95df
am:
2b44297ff7
* commit '
2b44297ff7004196ec6dcb631a4430e0c29c9bd2':
Track external/icu API changes for factory registration
ICU4J: Hide constants that can change between releases
Remove RawCollationKey/ByteArrayWrapper from the public API
Change-Id: I485a59fa5a565d6916c9eed1e03dce3d01145a4e
Neil Fuller [Thu, 5 May 2016 15:15:55 +0000 (15:15 +0000)]
Merge changes from topic \'icu_cp_catchup\'
am:
f6aabd95df
* commit '
f6aabd95df71e5b64a0b3806a7632954ed7cfd99':
Track external/icu API changes for factory registration
ICU4J: Hide constants that can change between releases
Remove RawCollationKey/ByteArrayWrapper from the public API
Change-Id: Ifd6e4730450211a586ac8a6abec71c1faa055e8c
Neil Fuller [Thu, 5 May 2016 15:06:47 +0000 (15:06 +0000)]
Merge changes from topic 'icu_cp_catchup'
* changes:
Track external/icu API changes for factory registration
ICU4J: Hide constants that can change between releases
Remove RawCollationKey/ByteArrayWrapper from the public API
Android Build Merger (Role) [Thu, 5 May 2016 14:20:02 +0000 (14:20 +0000)]
Merge "Merge "Fix Trust Agent discovery for FBE" into nyc-dev am:
957df516f0 am:
27c6fb03d8" into nyc-mr1-dev-plus-aosp
Adrian Roos [Thu, 5 May 2016 14:19:35 +0000 (14:19 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev am:
957df516f0
am:
27c6fb03d8
* commit '
27c6fb03d8ab38c090e28a72aee1a4ccec514122':
Change-Id: Ib4c721e27ee0336758c1738e21766f5f08e88fcb
Android Build Merger (Role) [Thu, 5 May 2016 14:17:39 +0000 (14:17 +0000)]
Merge "Merge "Fix Trust Agent discovery for FBE" into nyc-dev am:
957df516f0 am:
27c6fb03d8" into nyc-mr1-dev-plus-aosp
Adrian Roos [Thu, 5 May 2016 14:17:11 +0000 (14:17 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev am:
957df516f0
am:
27c6fb03d8
* commit '
27c6fb03d8ab38c090e28a72aee1a4ccec514122':
Fix Trust Agent discovery for FBE
Change-Id: I5cb87859e9717f6e73af54b3b79426577ec893b1
Adrian Roos [Thu, 5 May 2016 14:17:05 +0000 (14:17 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev am:
957df516f0
am:
a4de8ee5ee
* commit '
a4de8ee5ee2a9024e9abf946027d18471db63fe0':
Fix Trust Agent discovery for FBE
Change-Id: I3af292946e793d21109907ee926655294712898e
Jason Monk [Thu, 5 May 2016 14:15:25 +0000 (10:15 -0400)]
Fix QS header settings + user visibilities
Change-Id: If2b5fb2ab47254bb0e44685a0fcd5d92d5d347fb
Fixes:
28235542
Adrian Roos [Thu, 5 May 2016 14:12:39 +0000 (14:12 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev
am:
957df516f0
* commit '
957df516f006129198847ff9448004c097e1be98':
Fix Trust Agent discovery for FBE
Change-Id: I51cfea9ab91950fea7f0e599a4300b4ac42d5849
Adrian Roos [Thu, 5 May 2016 14:12:33 +0000 (14:12 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev
am:
957df516f0
* commit '
957df516f006129198847ff9448004c097e1be98':
Fix Trust Agent discovery for FBE
Change-Id: I6afecf1568563550a95a73611576035c5f9a09c8
Adrian Roos [Thu, 5 May 2016 14:05:08 +0000 (14:05 +0000)]
Merge "Fix Trust Agent discovery for FBE" into nyc-dev
Android Build Merger (Role) [Thu, 5 May 2016 13:39:36 +0000 (13:39 +0000)]
Merge "Merge "Fix RTL margins on Power dialog" into nyc-dev am:
6bfac039b1 am:
9a1cc86c35" into nyc-mr1-dev-plus-aosp
Clara Bayarri [Thu, 5 May 2016 13:39:11 +0000 (13:39 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev am:
6bfac039b1
am:
9a1cc86c35
* commit '
9a1cc86c35965477078f5b9a51d63e59b6577a9c':
Change-Id: I6c39c7a4f87a44d696a00c2bb0d90b5a7462a1df
Android Build Merger (Role) [Thu, 5 May 2016 13:37:27 +0000 (13:37 +0000)]
Merge "Merge "Fix RTL margins on Power dialog" into nyc-dev am:
6bfac039b1 am:
9a1cc86c35" into nyc-mr1-dev-plus-aosp
Clara Bayarri [Thu, 5 May 2016 13:37:00 +0000 (13:37 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev am:
6bfac039b1
am:
0722dabda6
* commit '
0722dabda6250c7e42a1ba95e75ac0d62ed38aab':
Fix RTL margins on Power dialog
Change-Id: Iedac5603ca3baded90b00142121b4816eb493b14
Clara Bayarri [Thu, 5 May 2016 13:36:58 +0000 (13:36 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev am:
6bfac039b1
am:
9a1cc86c35
* commit '
9a1cc86c35965477078f5b9a51d63e59b6577a9c':
Fix RTL margins on Power dialog
Change-Id: Ia184e2295342b86a0c53a21f4736dfea3a1d9961
Clara Bayarri [Thu, 5 May 2016 13:34:31 +0000 (13:34 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev
am:
6bfac039b1
* commit '
6bfac039b130268868af21252c58d07fcaa64074':
Fix RTL margins on Power dialog
Change-Id: Icb15ac4c932645e3a07197a9d181e283a4f34fd8
Clara Bayarri [Thu, 5 May 2016 13:34:30 +0000 (13:34 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev
am:
6bfac039b1
* commit '
6bfac039b130268868af21252c58d07fcaa64074':
Fix RTL margins on Power dialog
Change-Id: I3d18791d9008dfd877878008e81507efdb84723f
Clara Bayarri [Thu, 5 May 2016 13:29:12 +0000 (13:29 +0000)]
Merge "Fix RTL margins on Power dialog" into nyc-dev
Android Build Merger (Role) [Thu, 5 May 2016 13:22:42 +0000 (13:22 +0000)]
Merge "Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev am:
1ef61df23c am:
f3eef0712d" into nyc-mr1-dev-plus-aosp
Narayan Kamath [Thu, 5 May 2016 13:22:18 +0000 (13:22 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev am:
1ef61df23c
am:
f3eef0712d
* commit '
f3eef0712d5cb8fa30f25219e28281599e97d36f':
Change-Id: Ic4eb8c3b48578dfd83cfcdd0cc1ed300abe7ba60
Android Build Merger (Role) [Thu, 5 May 2016 13:20:31 +0000 (13:20 +0000)]
Merge "Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev am:
1ef61df23c am:
f3eef0712d" into nyc-mr1-dev-plus-aosp
Narayan Kamath [Thu, 5 May 2016 13:20:05 +0000 (13:20 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev am:
1ef61df23c
am:
f3eef0712d
* commit '
f3eef0712d5cb8fa30f25219e28281599e97d36f':
PackageManager : Log stats about the optimizing apps dialog.
Change-Id: I75b123f078ecf834fc86fd33f8546307aac48182
Narayan Kamath [Thu, 5 May 2016 13:20:01 +0000 (13:20 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev am:
1ef61df23c
am:
292f4f7941
* commit '
292f4f7941a6f78af902e8421e97cdfb2e00f7a8':
PackageManager : Log stats about the optimizing apps dialog.
Change-Id: I25a2f7e2ad10984cef1f04298aaa482e8fef7bb7
Android Build Merger (Role) [Thu, 5 May 2016 13:17:41 +0000 (13:17 +0000)]
Merge "Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am:
1448962a95 am:
6f2cff43c0" into nyc-mr1-dev-plus-aosp
Narayan Kamath [Thu, 5 May 2016 13:17:01 +0000 (13:17 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev
am:
1ef61df23c
* commit '
1ef61df23c37b34fb7444ef8bbf802f276204484':
PackageManager : Log stats about the optimizing apps dialog.
Change-Id: If95c3a60b9b612f2ffdba313763787edd0c7b774
Rubin Xu [Thu, 5 May 2016 13:17:01 +0000 (13:17 +0000)]
Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am:
1448962a95
am:
6f2cff43c0
* commit '
6f2cff43c08db6a64e5871f04e335e88ff32d471':
Guard retrievePreRebootSecurityLogs with config flag
Change-Id: Ia93bb18e743b55013d10440db07e8f83b8cb9362
Narayan Kamath [Thu, 5 May 2016 13:16:55 +0000 (13:16 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev
am:
1ef61df23c
* commit '
1ef61df23c37b34fb7444ef8bbf802f276204484':
PackageManager : Log stats about the optimizing apps dialog.
Change-Id: I39161841480a925b36764e6d7ebd278fc9ac0103
Rubin Xu [Thu, 5 May 2016 13:16:55 +0000 (13:16 +0000)]
Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev am:
1448962a95
am:
b9d94a454d
* commit '
b9d94a454d426e86f7c032f130d089af65120bf4':
Guard retrievePreRebootSecurityLogs with config flag
Change-Id: I25456d9756eefb619d446f23d48b0919a53c073f
Rubin Xu [Thu, 5 May 2016 13:12:45 +0000 (13:12 +0000)]
Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
am:
1448962a95
* commit '
1448962a95f40db93af02057e0804a375f3d62ca':
Guard retrievePreRebootSecurityLogs with config flag
Change-Id: I30bfa6eb621ced3a9aab4f10ad8bd89fee6ee675
Rubin Xu [Thu, 5 May 2016 13:12:43 +0000 (13:12 +0000)]
Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
am:
1448962a95
* commit '
1448962a95f40db93af02057e0804a375f3d62ca':
Guard retrievePreRebootSecurityLogs with config flag
Change-Id: I9d76de442e2b852314874d4121be7f15e40045b1
TreeHugger Robot [Thu, 5 May 2016 13:10:47 +0000 (13:10 +0000)]
Merge "PackageManager : Log stats about the optimizing apps dialog." into nyc-dev
Rubin Xu [Thu, 5 May 2016 13:03:46 +0000 (13:03 +0000)]
Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev
Android Build Merger (Role) [Thu, 5 May 2016 12:30:39 +0000 (12:30 +0000)]
Merge "Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev am:
e37ecbdede am:
619ccaca06" into nyc-mr1-dev-plus-aosp
Diego Perez [Thu, 5 May 2016 12:30:15 +0000 (12:30 +0000)]
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev am:
e37ecbdede
am:
619ccaca06
* commit '
619ccaca06df9f7c15e4ad25d0708d7c53b531c4':
Add missing delegate in Bitmap_Delegate
Change-Id: I4b0c3be93154e778040ffe604ec7ad857ebecb66
Diego Perez [Thu, 5 May 2016 12:30:12 +0000 (12:30 +0000)]
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev am:
e37ecbdede
am:
e8498819f8
* commit '
e8498819f80226065c077cb78451848d6514728d':
Add missing delegate in Bitmap_Delegate
Change-Id: I6c2475f85dfb663017d0f3123b964ecdc459d6aa
Diego Perez [Thu, 5 May 2016 12:27:45 +0000 (12:27 +0000)]
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev
am:
e37ecbdede
* commit '
e37ecbdede9bb3b4fadba359891b13eb5cd6c697':
Add missing delegate in Bitmap_Delegate
Change-Id: Ib8e9fd1772a605ba75ffd7cf868fa654c50cb1e5
Diego Perez [Thu, 5 May 2016 12:27:42 +0000 (12:27 +0000)]
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev
am:
e37ecbdede
* commit '
e37ecbdede9bb3b4fadba359891b13eb5cd6c697':
Add missing delegate in Bitmap_Delegate
Change-Id: Iff826aed812d38901b72524cd4ec54dd5908545f
Diego Perez [Thu, 5 May 2016 12:21:34 +0000 (12:21 +0000)]
Merge "Add missing delegate in Bitmap_Delegate" into nyc-dev
Narayan Kamath [Tue, 3 May 2016 10:55:23 +0000 (11:55 +0100)]
PackageManager : Log stats about the optimizing apps dialog.
Logs the following parameters :
- Total time spent optimizing apps.
- Total number of apps that were dexopted.
TESTED: with adb logcat -b events:
05-04 15:24:16.303 2065 2065 I sysui_action: [402,3]
05-04 15:24:16.303 2065 2065 I sysui_action: [403,34]
05-04 15:24:16.303 2065 2065 I sysui_action: [404,0]
05-04 15:24:16.304 2065 2065 I sysui_action: [405,163]
05-04 15:24:16.304 2065 2065 I sysui_action: [406,12168]
This shows that:
- 3 apps were optimized
- 34 apps were skipped
- 0 apps failed to optimize
- dialog showed a total of 37 (3 + 34 + 0) apps
- system has 163 optimizable packages
- a total of 12.2 seconds was spent in the optimizing apps dialog
bug:
28528058
bug:
28544474
Change-Id: I9eb5229a1589ca0df57d3fc03102992fa90a877f
Rubin Xu [Wed, 4 May 2016 18:01:07 +0000 (19:01 +0100)]
Guard retrievePreRebootSecurityLogs with config flag
Bug:
28160645
Change-Id: Ifce884c319019758dfaaa39bc239e9f30962c920
Neil Fuller [Wed, 4 May 2016 17:46:45 +0000 (18:46 +0100)]
Track external/icu API changes for factory registration
Bug:
28583844
(cherry picked from commit
e7fda97fff236afa5597da7df69b1462390c5a14)
Change-Id: I4a411184fe002ea812349e49d07d17c62c66d842
Paul Duffin [Thu, 31 Mar 2016 12:15:03 +0000 (13:15 +0100)]
ICU4J: Hide constants that can change between releases
Bug:
27830659
(cherry picked from commit
71498f107ce41a1c3f2bc612fa214579aab19db1)
Change-Id: I007ed563d78cdf36ddd0e36ae72f118189772e5c
Paul Duffin [Tue, 22 Mar 2016 16:53:41 +0000 (16:53 +0000)]
Remove RawCollationKey/ByteArrayWrapper from the public API
Bug:
22023363
(cherry picked from commit
baa72515f60af798ea9a03e53a78a7d95834ceff)
Change-Id: If81d9a67ba9edf15688f4369390a6734d92a8f3c
Android Build Merger (Role) [Thu, 5 May 2016 10:06:05 +0000 (10:06 +0000)]
Merge "Merge "Track external/icu API changes for factory registration" into nyc-dev am:
00e8fef0ba am:
08b46f3431" into nyc-mr1-dev-plus-aosp
Neil Fuller [Thu, 5 May 2016 10:05:39 +0000 (10:05 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev am:
00e8fef0ba
am:
08b46f3431
* commit '
08b46f3431163701ad08d48a0dacfb2a4fe42ab2':
Change-Id: I636f137e50b386a04513813c9e047ac3930699c5
Android Build Merger (Role) [Thu, 5 May 2016 10:03:52 +0000 (10:03 +0000)]
Merge "Merge "Track external/icu API changes for factory registration" into nyc-dev am:
00e8fef0ba am:
08b46f3431" into nyc-mr1-dev-plus-aosp
Neil Fuller [Thu, 5 May 2016 10:03:19 +0000 (10:03 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev am:
00e8fef0ba
am:
08b46f3431
* commit '
08b46f3431163701ad08d48a0dacfb2a4fe42ab2':
Track external/icu API changes for factory registration
Change-Id: I205e42f97d4e2ec45c2bffa83c3e1aa7356d6c50
Neil Fuller [Thu, 5 May 2016 10:03:16 +0000 (10:03 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev am:
00e8fef0ba
am:
bd6e38e6b7
* commit '
bd6e38e6b70a0b262414074f393b79dd0de5900d':
Track external/icu API changes for factory registration
Change-Id: I3b27d1649ad5b89bac0ec52861960a019be15e81
Neil Fuller [Thu, 5 May 2016 10:00:42 +0000 (10:00 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev
am:
00e8fef0ba
* commit '
00e8fef0ba61cd57cd36beeb81ae1eb20ac04eaf':
Track external/icu API changes for factory registration
Change-Id: Ic4633d63e4d659b20eeeb4502a278a6fe365fd2a
Neil Fuller [Thu, 5 May 2016 10:00:40 +0000 (10:00 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev
am:
00e8fef0ba
* commit '
00e8fef0ba61cd57cd36beeb81ae1eb20ac04eaf':
Track external/icu API changes for factory registration
Change-Id: Ic1e5a3d6b7a3479a2feec75e1729411485eab1ad
Neil Fuller [Thu, 5 May 2016 09:54:45 +0000 (09:54 +0000)]
Merge "Track external/icu API changes for factory registration" into nyc-dev
Jaewan Kim [Thu, 5 May 2016 05:04:52 +0000 (05:04 +0000)]
Merge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev am:
92e5a0dfa6
am:
c1376252b4
* commit '
c1376252b4e9ee43c2acafc8855410d1bd23d3b6':
Change-Id: Ib523439c5e885049f0a0449421a6756ec7331d7c
Jaewan Kim [Thu, 5 May 2016 05:02:52 +0000 (05:02 +0000)]
Merge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev am:
92e5a0dfa6
am:
79bcd943ef
* commit '
79bcd943ef9341e5a1e4472d94e1eb21e43852e8':
Fix thumbnail transition animation when Recents is shown with PIP
Change-Id: I235dc4af4f02c5e61f633cce32d61c91c809ff2e
Jaewan Kim [Thu, 5 May 2016 05:00:35 +0000 (05:00 +0000)]
Merge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev
am:
92e5a0dfa6
* commit '
92e5a0dfa66f5cb454ce1bbe7246e806b2517e85':
Fix thumbnail transition animation when Recents is shown with PIP
Change-Id: Ic224b416e8f9dfd77db59e5af92602ec9b1f1777
Jaewan Kim [Thu, 5 May 2016 05:00:17 +0000 (05:00 +0000)]
Merge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev
am:
92e5a0dfa6
* commit '
92e5a0dfa66f5cb454ce1bbe7246e806b2517e85':
Fix thumbnail transition animation when Recents is shown with PIP
Change-Id: I21de87dfcd366b9622b1d55fa88b5c9b08289b1d
Jaewan Kim [Thu, 5 May 2016 04:57:33 +0000 (04:57 +0000)]
Merge "Fix thumbnail transition animation when Recents is shown with PIP" into nyc-dev
Alan Viverette [Thu, 5 May 2016 02:34:28 +0000 (02:34 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev am:
a11c21b412
am:
1a1301286c
* commit '
1a1301286cc16052e58ee1508ef62a19b6b03786':
Change-Id: I1432e02e06cb5d477208fce9385510d7a27c903a
Alan Viverette [Thu, 5 May 2016 02:32:29 +0000 (02:32 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev am:
a11c21b412
am:
9204810e66
* commit '
9204810e668d14e3d739726da996a89488e7e6d9':
Always assign leftover pixels to last weighted child
Change-Id: I5fe075d83f6b299511a92cc5721f0b68614f6e80
Alan Viverette [Thu, 5 May 2016 02:30:18 +0000 (02:30 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev
am:
a11c21b412
* commit '
a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
Always assign leftover pixels to last weighted child
Change-Id: I80fbcb2d86b718bd02f7e0528bd498b894381502
Alan Viverette [Thu, 5 May 2016 02:29:57 +0000 (02:29 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev
am:
a11c21b412
* commit '
a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
Always assign leftover pixels to last weighted child
Change-Id: Ibfaa979ba23c204172015fae11a767be8a4852dc