git.osdn.net Git - android-x86/frameworks-base.git/log

Artem Iglikov [Wed, 12 Apr 2017 09:52:32 +0000 (09:52 +0000)]

Merge "Move inner classes of RefactoredBackupManagerService to their own files."

Abodunrinwa Toki [Wed, 12 Apr 2017 09:24:28 +0000 (09:24 +0000)]

Merge "Make "Paste as plain text" resource string public." into oc-dev am: 7d4cf66b17
am: 9815cc5783

Change-Id: Ie26187778f0d01be8926484accc9ecbda49946bd

commit | commitdiff | tree

Hyunyoung Song [Wed, 12 Apr 2017 09:23:04 +0000 (09:23 +0000)]

Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev am: 264f2e40e2
am: ebcc722b74

Change-Id: Id5087991c8927f7535cb51686317c5730f53471e

commit | commitdiff | tree

Abodunrinwa Toki [Wed, 12 Apr 2017 09:17:33 +0000 (09:17 +0000)]

Merge "Make "Paste as plain text" resource string public." into oc-dev
am: 7d4cf66b17

Change-Id: I6be7e69dd5b172215494a2736bb7e91e36d7b09c

commit | commitdiff | tree

Hyunyoung Song [Wed, 12 Apr 2017 09:12:32 +0000 (09:12 +0000)]

Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev
am: 264f2e40e2

Change-Id: I702c3b790d6b5c0abb9cbc65cdf4e5bfb2b527d9

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 09:12:19 +0000 (09:12 +0000)]

Merge "Make "Paste as plain text" resource string public." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 09:02:10 +0000 (09:02 +0000)]

Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev

commit | commitdiff | tree

Jorim Jaggi [Wed, 12 Apr 2017 05:29:17 +0000 (05:29 +0000)]

Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev am: 39608b8556
am: 11a99404ce

Change-Id: I400130c5126d718d71be7daf5e0685f44eaebd27

commit | commitdiff | tree

Jorim Jaggi [Wed, 12 Apr 2017 05:18:45 +0000 (05:18 +0000)]

Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev
am: 39608b8556

Change-Id: I73dad3226b72bc2b76034c42a77e25be75685a29

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 05:10:59 +0000 (05:10 +0000)]

Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev

commit | commitdiff | tree

Suprabh Shukla [Wed, 12 Apr 2017 04:55:08 +0000 (04:55 +0000)]

Merge "Renaming intent action for unknown sources" into oc-dev am: a609bbc9c4
am: 56fa529c28

Change-Id: I28f085f5ea2b2d94c23a42f69ce19ea6c8d5c94f

commit | commitdiff | tree

Suprabh Shukla [Wed, 12 Apr 2017 04:45:31 +0000 (04:45 +0000)]

Merge "Renaming intent action for unknown sources" into oc-dev
am: a609bbc9c4

Change-Id: I67e378a818d5fb74e602a32c67eb3299adf36549

commit | commitdiff | tree

Suprabh Shukla [Wed, 12 Apr 2017 04:32:45 +0000 (04:32 +0000)]

Merge "Renaming intent action for unknown sources" into oc-dev

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 03:29:21 +0000 (03:29 +0000)]

Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission."

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 02:24:40 +0000 (02:24 +0000)]

Merge "Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3 am: 6717748eff -s ours" into oc-dev-plus-aosp
am: 9431773039

Change-Id: I6f01161b7d11a65585c8da025932c84d32663c92

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 02:21:15 +0000 (02:21 +0000)]

Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3 -s ours am: ed799ef6fb
am: 3e00a43eb0

Change-Id: I274fafafda952f5426cb7119d1752710f64861ce

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 12 Apr 2017 02:12:34 +0000 (02:12 +0000)]

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 02:11:27 +0000 (02:11 +0000)]

Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3 -s ours
am: ed799ef6fb

Change-Id: I61b21b6fe6e3bbb97b8cc2f67f7d66a9c66ef943

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 02:11:26 +0000 (02:11 +0000)]

Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96 am: 3c6d6f53f3
am: 6717748eff -s ours

Change-Id: I8ef6575486308872b5eaea54777b497dc3a00616

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 02:01:49 +0000 (02:01 +0000)]

Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96
am: 3c6d6f53f3 -s ours

Change-Id: Ic4af1cac3a0929db20eccd0693ec5fad834b0093

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 02:01:28 +0000 (02:01 +0000)]

Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96
am: 3c6d6f53f3

Change-Id: I4a3785a799a523c1e650929cf70f333a2492377e

commit | commitdiff | tree

Julia Reynolds [Wed, 12 Apr 2017 01:56:06 +0000 (01:56 +0000)]

Merge "Changing importance should record user locked field." into oc-dev am: f61985f02e
am: cc6836cf64

Change-Id: I8f0b3c1aaa7a7f764c8ce815feb6fc3005710bda

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 01:55:57 +0000 (01:55 +0000)]

Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
am: 9e3c9eeb96

Change-Id: Ic97ec1a7e4c5b76bcab8350102585e4dd2cd199b

commit | commitdiff | tree

Andreas Gampe [Wed, 12 Apr 2017 01:55:01 +0000 (01:55 +0000)]

Merge "OtaDexOptService: Log post-reboot moves" into oc-dev am: fac61e4928
am: bbf9b5d35d

Change-Id: I6ca07f8f797562db9a2ed270c0585561de5739cf

commit | commitdiff | tree

Julia Reynolds [Wed, 12 Apr 2017 01:46:07 +0000 (01:46 +0000)]

Merge "Changing importance should record user locked field." into oc-dev
am: f61985f02e

Change-Id: I8e53594947fd6bf1439da9c5d70e86cff111983b

commit | commitdiff | tree

Andreas Gampe [Wed, 12 Apr 2017 01:45:01 +0000 (01:45 +0000)]

Merge "OtaDexOptService: Log post-reboot moves" into oc-dev
am: fac61e4928

Change-Id: Id9d427f5d101d7d99ef313fd3b1ede9776ae655d

commit | commitdiff | tree

Julius D'souza [Wed, 12 Apr 2017 01:41:38 +0000 (01:41 +0000)]

Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 01:40:55 +0000 (01:40 +0000)]

Merge "Changing importance should record user locked field." into oc-dev

commit | commitdiff | tree

Andreas Gampe [Wed, 12 Apr 2017 01:36:31 +0000 (01:36 +0000)]

Merge "OtaDexOptService: Log post-reboot moves" into oc-dev

commit | commitdiff | tree

Julia Reynolds [Wed, 12 Apr 2017 01:35:07 +0000 (01:35 +0000)]

Merge "Allow companion device mgrs channel access" into oc-dev am: de99065a40
am: a38256bb7b

Change-Id: Ieef842a262e0f10f01ef801d4b8e4f3c80b83ef6

commit | commitdiff | tree

Bill Yi [Wed, 12 Apr 2017 01:31:41 +0000 (01:31 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 76be6a7a6b -s ours
am: 3486ad7d4f -s ours

Change-Id: I7935ddf94e29577cdb8741c23b335d4f955be937

commit | commitdiff | tree

Julia Reynolds [Wed, 12 Apr 2017 01:31:03 +0000 (01:31 +0000)]

Merge "Allow companion device mgrs channel access" into oc-dev
am: de99065a40

Change-Id: I7de72421e62670f69d2d85837868efe0ef019a0a

commit | commitdiff | tree

Conrad Chen [Wed, 12 Apr 2017 01:30:33 +0000 (01:30 +0000)]

Merge "TIF: add TvInputManager methods to notify apps" into oc-dev am: 307bec8572
am: 081db81a99

Change-Id: I267fe4c5723ffa66c0555bba862b1618aebae5fd

commit | commitdiff | tree

David Stevens [Wed, 12 Apr 2017 01:23:07 +0000 (01:23 +0000)]

Merge "Reset the default usb package less often" into oc-dev am: 1654143680
am: 8e40723876

Change-Id: I041f7fdaf689fde58f7853af075f708b30418201

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 01:22:49 +0000 (01:22 +0000)]

Merge "Allow companion device mgrs channel access" into oc-dev

commit | commitdiff | tree

Bill Yi [Wed, 12 Apr 2017 01:22:02 +0000 (01:22 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 116c09f71d -s ours
am: 6a26575076 -s ours

Change-Id: If2243523ee11b67e5df900a6811b9fa7db322b77

commit | commitdiff | tree

Colin Cross [Wed, 12 Apr 2017 01:18:36 +0000 (01:18 +0000)]

Merge "Add missing transitive dependencies" into oc-dev am: 3fa195c3cf
am: 902e25b34e

Change-Id: Idf8db002a4c902a0dcc74a6605dea8eba340f674

commit | commitdiff | tree

Bill Yi [Wed, 12 Apr 2017 01:18:04 +0000 (01:18 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 76be6a7a6b -s ours

Change-Id: Id57dcef4da9f9eac4f4eb8e8e88fcf37bd59588e

commit | commitdiff | tree

Conrad Chen [Wed, 12 Apr 2017 01:17:00 +0000 (01:17 +0000)]

Merge "TIF: add TvInputManager methods to notify apps" into oc-dev
am: 307bec8572

Change-Id: I3550c39408739e0a3d1fce93cc35b09a3b77d70f

commit | commitdiff | tree

Colin Cross [Wed, 12 Apr 2017 01:14:04 +0000 (01:14 +0000)]

Merge "Update layoutlib to match java library changes" into oc-dev am: d88676f363
am: 7ce6dac7c9

Change-Id: I5a616707aec84b1da1b5ed541def5fc47f199387

commit | commitdiff | tree

David Stevens [Wed, 12 Apr 2017 01:13:37 +0000 (01:13 +0000)]

Merge "Reset the default usb package less often" into oc-dev
am: 1654143680

Change-Id: I8c7986ed572aea065140999281c91424aade8f48

commit | commitdiff | tree

Bill Yi [Wed, 12 Apr 2017 01:12:24 +0000 (01:12 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 116c09f71d -s ours

Change-Id: Ied38bd3b8b0bf8a4f22bcc22af147664494c862a

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 01:07:28 +0000 (01:07 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

Colin Cross [Wed, 12 Apr 2017 01:06:53 +0000 (01:06 +0000)]

Merge "Add missing transitive dependencies" into oc-dev
am: 3fa195c3cf

Change-Id: Ie1a88f1fa5fc857dbebc739b0a6f0a9de6e351eb

commit | commitdiff | tree

Colin Cross [Wed, 12 Apr 2017 01:01:44 +0000 (01:01 +0000)]

Merge "Update layoutlib to match java library changes" into oc-dev
am: d88676f363

Change-Id: I7fd70578991b1c26a868d4cf856a41b2a69b1319

commit | commitdiff | tree

Mathieu Chartier [Wed, 12 Apr 2017 00:31:56 +0000 (00:31 +0000)]

Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" am: d269f30d62 am: f62b12ae31 am: 540bc2d94e
am: 3201b52bd5

Change-Id: I7e2f8da8b8b23cb9f567e3ec384120a1ac4b3c07

commit | commitdiff | tree

Mathieu Chartier [Wed, 12 Apr 2017 00:27:56 +0000 (00:27 +0000)]

Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" am: d269f30d62 am: f62b12ae31
am: 540bc2d94e

Change-Id: Ibb9428212a374a9e7050fcb4358dd896604d2982

commit | commitdiff | tree

Abodunrinwa Toki [Tue, 11 Apr 2017 02:47:41 +0000 (03:47 +0100)]

Make "Paste as plain text" resource string public.

Test: no test
Bug: 37164197
Change-Id: Ia15bd434e1d4ccdf9f1711db3a323c89bc2f96ff

commit | commitdiff | tree

Roozbeh Pournader [Wed, 12 Apr 2017 00:26:36 +0000 (00:26 +0000)]

Merge "Keep spans while transforming to uppercase" into oc-dev am: cd3f72d628
am: c6df994b66

Change-Id: I1503c0e669679d1e6c4d4b0ec3de3ca5303ef972

commit | commitdiff | tree

Conrad Chen [Wed, 12 Apr 2017 00:25:33 +0000 (00:25 +0000)]

Merge "TIF: add TvInputManager methods to notify apps" into oc-dev

commit | commitdiff | tree

Evan Rosky [Wed, 12 Apr 2017 00:23:34 +0000 (00:23 +0000)]

Merge "Make AdapterView auto-focusable-aware" into oc-dev am: 7d6bf45428
am: 97a97c72fd

Change-Id: I479ab314b04f9f0769bd18c9742267829892deb1

commit | commitdiff | tree

Mathieu Chartier [Wed, 12 Apr 2017 00:20:23 +0000 (00:20 +0000)]

Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING" am: d269f30d62
am: f62b12ae31

Change-Id: I002c55618a647e4ab17fff50f89b04df3e492e9e

commit | commitdiff | tree

Jorim Jaggi [Wed, 12 Apr 2017 00:16:12 +0000 (00:16 +0000)]

Merge "Improve caching behavior of thumbnails" into oc-dev am: b67e105e74
am: a18b3c475c

Change-Id: I4e3c4b8a1c4757ff1206786ca161acd0a0e59503

commit | commitdiff | tree

Jason Monk [Wed, 12 Apr 2017 00:15:07 +0000 (00:15 +0000)]

Merge "Clean up activity a bit and disable it by default" into oc-dev am: 1df5ca5911
am: eae4ab352e

Change-Id: I161a6acef191800f1f491864061a06c8794af9cb

commit | commitdiff | tree

Roozbeh Pournader [Wed, 12 Apr 2017 00:14:26 +0000 (00:14 +0000)]

Merge "Keep spans while transforming to uppercase" into oc-dev
am: cd3f72d628

Change-Id: Ie93ae0764c46883c46f5d4f5a8996d57aa143b7e

commit | commitdiff | tree

David Stevens [Wed, 12 Apr 2017 00:12:11 +0000 (00:12 +0000)]

Merge "Reset the default usb package less often" into oc-dev

commit | commitdiff | tree

Evan Rosky [Wed, 12 Apr 2017 00:11:54 +0000 (00:11 +0000)]

Merge "Make AdapterView auto-focusable-aware" into oc-dev
am: 7d6bf45428

Change-Id: I1f44573ac5aa04c097f7d93298e27d99c54c6ce8

commit | commitdiff | tree

Wale Ogunwale [Wed, 12 Apr 2017 00:11:09 +0000 (00:11 +0000)]

Merge "Ensure visible activities when device is unlocked." into oc-dev am: 293afb3917
am: 1ee52a4c36

Change-Id: I7a28d14975dc9947e08eed48a610552c56e32984

commit | commitdiff | tree

Mathieu Chartier [Wed, 12 Apr 2017 00:09:47 +0000 (00:09 +0000)]

Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING"
am: d269f30d62

Change-Id: I2830356fd9288feef334e19a1281c720c6fd7fca

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 00:07:29 +0000 (00:07 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

Colin Cross [Wed, 12 Apr 2017 00:06:02 +0000 (00:06 +0000)]

Merge "Add missing transitive dependencies" into oc-dev

commit | commitdiff | tree

Colin Cross [Wed, 12 Apr 2017 00:04:55 +0000 (00:04 +0000)]

Merge "Update layoutlib to match java library changes" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 00:04:00 +0000 (00:04 +0000)]

Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test."

commit | commitdiff | tree

TreeHugger Robot [Wed, 12 Apr 2017 00:02:32 +0000 (00:02 +0000)]

Merge "Keep spans while transforming to uppercase" into oc-dev

commit | commitdiff | tree

Evan Rosky [Wed, 12 Apr 2017 00:02:21 +0000 (00:02 +0000)]

Merge "Make AdapterView auto-focusable-aware" into oc-dev

commit | commitdiff | tree

Jorim Jaggi [Wed, 12 Apr 2017 00:01:41 +0000 (00:01 +0000)]

Merge "Improve caching behavior of thumbnails" into oc-dev
am: b67e105e74

Change-Id: I48914589de80ca11c97919bb5af6903ae46d2b3f

commit | commitdiff | tree

Jason Monk [Wed, 12 Apr 2017 00:00:32 +0000 (00:00 +0000)]

Merge "Clean up activity a bit and disable it by default" into oc-dev
am: 1df5ca5911

Change-Id: Idb7475a6715e8cc5d4f2c9e2e418d4cedd7d9c10

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Apr 2017 23:59:28 +0000 (23:59 +0000)]

Merge "Fix some maps to be HEAP_DALVIK_CODE_CACHE instead of HEAP_DALVIK_ACCOUNTING"

commit | commitdiff | tree

Wale Ogunwale [Tue, 11 Apr 2017 23:59:22 +0000 (23:59 +0000)]

Merge "Ensure visible activities when device is unlocked." into oc-dev
am: 293afb3917

Change-Id: I7e8827cdc75212223fa9e42852f8505dbebee8eb

commit | commitdiff | tree

Mark Salyzyn [Tue, 11 Apr 2017 23:53:58 +0000 (23:53 +0000)]

Merge "jni: isLoggable: adapt to removal of property name size limit" am: cf39eea407 am: 5f98be7f11 am: 3da7584dc4
am: 097487aaaf

Change-Id: Ic482074150cf13499742bffc6049a89ee47d4172

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 23:53:14 +0000 (23:53 +0000)]

Merge "Improve caching behavior of thumbnails" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 23:51:48 +0000 (23:51 +0000)]

Merge "Clean up activity a bit and disable it by default" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 23:50:07 +0000 (23:50 +0000)]

Merge "Ensure visible activities when device is unlocked." into oc-dev

commit | commitdiff | tree

Mark Salyzyn [Tue, 11 Apr 2017 23:44:04 +0000 (23:44 +0000)]

Merge "jni: isLoggable: adapt to removal of property name size limit" am: cf39eea407 am: 5f98be7f11
am: 3da7584dc4

Change-Id: I2fd96c0c9cae8043bb5fabaa32b542b6965abcf7

commit | commitdiff | tree

Mark Salyzyn [Tue, 11 Apr 2017 23:33:22 +0000 (23:33 +0000)]

Merge "jni: isLoggable: adapt to removal of property name size limit" am: cf39eea407
am: 5f98be7f11

Change-Id: I4997e6f310c08cd0cf094a04685859b2853f8a05

commit | commitdiff | tree

Jeff Sharkey [Tue, 11 Apr 2017 23:30:12 +0000 (23:30 +0000)]

Merge "Grant Shell ability to clear cached app data." into oc-dev am: 1f58ad1a2f
am: 003572c3c8

Change-Id: Ifcb2d020b44fd69c08e411e5ace3d054887565eb

commit | commitdiff | tree

Brad Ebinger [Tue, 11 Apr 2017 23:29:11 +0000 (23:29 +0000)]

Merge "Move @SystemApi access to ImsService" into oc-dev am: 509a311976
am: 442d7645a2

Change-Id: I215d2ba6dd947a3979aa17b6695a77cb7b50288f

commit | commitdiff | tree

Mark Salyzyn [Tue, 11 Apr 2017 23:25:06 +0000 (23:25 +0000)]

Merge "jni: isLoggable: adapt to removal of property name size limit"
am: cf39eea407

Change-Id: I225add287a014fa8e2623d1e61456a5c523d5377

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 11 Apr 2017 23:23:37 +0000 (23:23 +0000)]

Merge "Merge "Toast whenever a notification fails to post" into oc-dev am: b287e9907a am: 15417d0f9d"

commit | commitdiff | tree

Geoffrey Pitsch [Tue, 11 Apr 2017 23:22:48 +0000 (23:22 +0000)]

Merge "Toast whenever a notification fails to post" into oc-dev am: b287e9907a
am: 15417d0f9d

Change-Id: I6aa292d8b44fcbe8a40037aef2822ec474876ef4

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 23:21:52 +0000 (23:21 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Jeff Sharkey [Tue, 11 Apr 2017 23:21:20 +0000 (23:21 +0000)]

Merge "Grant Shell ability to clear cached app data." into oc-dev
am: 1f58ad1a2f

Change-Id: Ieb4f37b861b9fd5a49d30d607de5589a355aa67d

commit | commitdiff | tree

Brad Ebinger [Tue, 11 Apr 2017 23:20:16 +0000 (23:20 +0000)]

Merge "Move @SystemApi access to ImsService" into oc-dev
am: 509a311976

Change-Id: I98a548a4a7f2df635d8132a93948ece3fb70be0a

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 23:15:32 +0000 (23:15 +0000)]

Merge "Grant Shell ability to clear cached app data." into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 23:14:57 +0000 (23:14 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Mark Salyzyn [Tue, 11 Apr 2017 23:13:06 +0000 (23:13 +0000)]

Merge "jni: isLoggable: adapt to removal of property name size limit"

commit | commitdiff | tree

Brad Ebinger [Tue, 11 Apr 2017 23:12:07 +0000 (23:12 +0000)]

Merge "Move @SystemApi access to ImsService" into oc-dev

commit | commitdiff | tree

Geoffrey Pitsch [Tue, 11 Apr 2017 23:09:20 +0000 (23:09 +0000)]

Merge "Toast whenever a notification fails to post" into oc-dev
am: b287e9907a

Change-Id: Idf8e29922f1192e258dd4c76172b3dfd36f6347b

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 22:59:59 +0000 (22:59 +0000)]

Merge "Toast whenever a notification fails to post" into oc-dev

commit | commitdiff | tree

Bill Yi [Tue, 11 Apr 2017 22:59:15 +0000 (22:59 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 6acaa0382c -s ours
am: 80b44f4f73 -s ours

Change-Id: Id81e02b87f35ffd56826a14d31887263de910d80

commit | commitdiff | tree

Jorim Jaggi [Tue, 11 Apr 2017 22:55:57 +0000 (15:55 -0700)]

Fix doc for FLAG_DISMISS_KEYGUARD

Test: n/a
Change-Id: I7e8b0e22895e5efe839dc0f73bcfda6a67f52026
Fix: 36023803

commit | commitdiff | tree

Bill Yi [Tue, 11 Apr 2017 22:49:17 +0000 (22:49 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 6acaa0382c -s ours

Change-Id: Icf19e23bddfdd2d1bd2865d3909e9ae42d767127

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 22:48:06 +0000 (22:48 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Bill Yi [Tue, 11 Apr 2017 22:39:15 +0000 (22:39 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev am: 911de0346c -s ours
am: e3102933d6 -s ours

Change-Id: I7e81c9ae5e7e5c5da8973606bd2360a10680f36c

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 22:35:45 +0000 (22:35 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 22:34:54 +0000 (22:34 +0000)]

Merge "Expose KeyguardBottomAreaView from StatusBar."

commit | commitdiff | tree

Bill Yi [Tue, 11 Apr 2017 22:34:18 +0000 (22:34 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 911de0346c -s ours

Change-Id: Iceda0abfce015f3fec2379a6202015de1996f26b

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 22:28:39 +0000 (22:28 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 11 Apr 2017 22:08:14 +0000 (22:08 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Amit Mahajan [Tue, 11 Apr 2017 21:59:03 +0000 (21:59 +0000)]

Merge "Add p2 option in openLogicalChannel." am: f954f2d5cc am: 7c6fa75512 am: 9c113787a4
am: ef23fff630

Change-Id: I6ebee0796c58bb6716285c3bb10d3bd7056efea1