Android Build Merger (Role)
|
83330b44a8
|
Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376 am: d88c71a6e2" into oc-dr1-dev-plus-aosp
|
2017-06-08 06:14:55 +00:00 |
|
Mark Rathjen
|
a29c976872
|
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376
am: d88c71a6e2
Change-Id: Ic6204047cd677b339ff3de0ba74e6b194086ea11
|
2017-06-08 06:14:00 +00:00 |
|
Android Build Merger (Role)
|
f097dc9d20
|
Merge "Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b am: 43f1ee3ac8" into oc-dr1-dev-plus-aosp
|
2017-06-08 06:13:41 +00:00 |
|
Yuchen He
|
016ca0a1cd
|
Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e9249b
am: 43f1ee3ac8
Change-Id: Ic0fb208b3b556269c24c8a6e8a557edf8bd917d4
|
2017-06-08 06:12:35 +00:00 |
|
Android Build Merger (Role)
|
263b044a1d
|
Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 am: 0fcadeaeb9" into oc-dr1-dev-plus-aosp
|
2017-06-08 06:12:13 +00:00 |
|
Adam Bookatz
|
7fe6fcbf96
|
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4
am: 0fcadeaeb9
Change-Id: Ieb7b6cd5299bab7f10c84f78e8ae1472988cff60
|
2017-06-08 06:09:46 +00:00 |
|
Andreas Gampe
|
ed8e5659cf
|
Merge "Framework: Remove SamplingProfiler" am: d2ecee2506 am: 3ea0309e39 -s ours
am: 76f6da62e6 -s ours
Change-Id: If989c3990ed4570ba0feb09a62ecf3e6359d9c0f
|
2017-06-08 06:08:30 +00:00 |
|
Felipe Leme
|
4d579eacec
|
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am: 9be8c96918
Change-Id: Ib165e14765a74e77fd41d15d979bf7f7ac0726ed
|
2017-06-08 06:07:15 +00:00 |
|
Android Build Merger (Role)
|
041bb40935
|
Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96 am: 23e5a1ee65" into oc-dr1-dev-plus-aosp
|
2017-06-08 06:05:37 +00:00 |
|
Mark Rathjen
|
d88c71a6e2
|
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am: 3492ed4376
Change-Id: I49015844829d55a903437a807b345688794002b5
|
2017-06-08 06:04:54 +00:00 |
|
Todd Kennedy
|
6f662ea114
|
Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96
am: 23e5a1ee65
Change-Id: If4f55496f91c671545796f774d7ed5031b97ef86
|
2017-06-08 06:04:42 +00:00 |
|
Android Build Merger (Role)
|
d7e9fb62d5
|
Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509 am: 7c44479edf" into oc-dr1-dev-plus-aosp
|
2017-06-08 06:04:19 +00:00 |
|
Phil Weaver
|
fc35c7784b
|
Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509
am: 7c44479edf
Change-Id: Ia25a60f70dd172a7c8dfe5c17e72bdf193b0d3f0
|
2017-06-08 06:03:29 +00:00 |
|
Android Build Merger (Role)
|
56f83527ae
|
Merge "Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978 am: de066fd249" into oc-dr1-dev-plus-aosp
|
2017-06-08 06:03:07 +00:00 |
|
Todd Kennedy
|
14398d764c
|
Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978
am: de066fd249
Change-Id: Ic66a91417dabf23ee798f5f38696e6fe543e9803
|
2017-06-08 06:02:07 +00:00 |
|
Yuchen He
|
43f1ee3ac8
|
Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev
am: 3671e9249b
Change-Id: I0a9c3a30877d1aa54cc45a67abcd4444eebf63c4
|
2017-06-08 06:01:50 +00:00 |
|
Android Build Merger (Role)
|
36e8ee9c1f
|
Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4 am: 300ebee8c4" into oc-dr1-dev-plus-aosp
|
2017-06-08 06:01:43 +00:00 |
|
Adam Bookatz
|
e9e89d0042
|
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4
am: 300ebee8c4
Change-Id: I0ae48f45c0debbe2e875ab123491c09bea265c3e
|
2017-06-08 06:00:42 +00:00 |
|
Android Build Merger (Role)
|
ed07898d13
|
Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96 am: 4d2a9a9f50" into oc-dr1-dev-plus-aosp
|
2017-06-08 06:00:19 +00:00 |
|
Adam Bookatz
|
0fcadeaeb9
|
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am: 6029bce3b4
Change-Id: Ib8292cc59afe1933bad8d48907ad47c46bb73e87
|
2017-06-08 05:59:56 +00:00 |
|
Todd Kennedy
|
8cd4502037
|
Merge changes Iea24e5a1,If71385bc into oc-dev am: 3834421c96
am: 4d2a9a9f50
Change-Id: Idceec36ea86ae6b00adb3ee24bbb08c3116403ce
|
2017-06-08 05:59:13 +00:00 |
|
Android Build Merger (Role)
|
fc7d48e703
|
Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509 am: 3d5bf99e7f" into oc-dr1-dev-plus-aosp
|
2017-06-08 05:58:51 +00:00 |
|
Phil Weaver
|
cd54ff31f0
|
Merge "Confirm a11y shortcut service for correct user" into oc-dev am: 03a5b3a509
am: 3d5bf99e7f
Change-Id: I7649712f41a7746acd21382e651e45fecf67a0cf
|
2017-06-08 05:57:56 +00:00 |
|
Android Build Merger (Role)
|
6e1e2090af
|
Merge "Merge "Embms download setup" am: da5b77fa9b am: a807ee8f1c am: b6a16546b5" into oc-dr1-dev-plus-aosp
|
2017-06-08 05:57:33 +00:00 |
|
Android Build Merger (Role)
|
e6d4e7ddb4
|
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: 13e4dfdceb" into oc-dr1-dev-plus-aosp
|
2017-06-08 05:56:33 +00:00 |
|
Hall Liu
|
7d576f60f2
|
Merge "Embms download setup" am: da5b77fa9b am: a807ee8f1c
am: b6a16546b5
Change-Id: I70d37518b24034a1e133bf6e9248feb64d439e6a
|
2017-06-08 05:55:56 +00:00 |
|
Android Build Merger (Role)
|
a985db2fb7
|
Merge "Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp am: 837f1167ca" into oc-dr1-dev-plus-aosp
|
2017-06-08 05:55:33 +00:00 |
|
Jeff Sharkey
|
6d04677fba
|
Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504
am: 13e4dfdceb
Change-Id: Id489b5ef70eb94b487d5cd913712594f8ca0b723
|
2017-06-08 05:55:32 +00:00 |
|
Android Build Merger (Role)
|
a8ae3296e2
|
Merge "Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e am: 2bb4966dab" into oc-dr1-dev-plus-aosp
|
2017-06-08 05:55:08 +00:00 |
|
Todd Kennedy
|
23e5a1ee65
|
Merge changes Iea24e5a1,If71385bc into oc-dev
am: 3834421c96
Change-Id: I691d03a8396d26193622f171f70f82d7aa91cea2
|
2017-06-08 05:54:33 +00:00 |
|
Andreas Gampe
|
f037caed37
|
Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
am: 837f1167ca
Change-Id: I2a510538bace272330e1d4446adf2451f3bb4c07
|
2017-06-08 05:54:32 +00:00 |
|
Sudheer Shanka
|
962ed48f50
|
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e
am: 2bb4966dab
Change-Id: Ib163b6a910f8206a6cc1767608fbbbac85bfd53f
|
2017-06-08 05:53:00 +00:00 |
|
Phil Weaver
|
7c44479edf
|
Merge "Confirm a11y shortcut service for correct user" into oc-dev
am: 03a5b3a509
Change-Id: I2e463c1602d1aca9d791d351f4170b0bac9abc90
|
2017-06-08 05:52:11 +00:00 |
|
Todd Kennedy
|
b524ada719
|
Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978
am: ddb322a000
Change-Id: Ic3ba662f2821aa617be0fa271e92e6cb805097c8
|
2017-06-08 05:52:09 +00:00 |
|
Todd Kennedy
|
de066fd249
|
Merge "Passing callingUid to internal methods" into oc-dev
am: dacdf2e978
Change-Id: Ie6e85346f63f4b06e693e6a6ac0c73b2ec3b9639
|
2017-06-08 05:50:03 +00:00 |
|
Android Build Merger (Role)
|
c5deced1d8
|
Merge "Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504 am: b1a2cde4fd" into oc-dr1-dev-plus-aosp
|
2017-06-08 05:49:19 +00:00 |
|
Android Build Merger (Role)
|
c9208d362f
|
Merge "Merge "resolve merge conflicts of 695f21a661 to oc-dr1-dev" into oc-dr1-dev am: be261948cb" into oc-dr1-dev-plus-aosp
|
2017-06-08 05:48:49 +00:00 |
|
Jeff Sharkey
|
b9fe492ddd
|
Merge "Add timeout to StrictMode flash." into oc-dev am: fdb3d31504
am: b1a2cde4fd
Change-Id: I9164bc0eac776ff7e8a61c227e4ad9db45663542
|
2017-06-08 05:48:21 +00:00 |
|
Jeff Sharkey
|
13e4dfdceb
|
Merge "Add timeout to StrictMode flash." into oc-dev
am: fdb3d31504
Change-Id: I646e27241743297d62a5442c845b61ee42b47a2f
|
2017-06-08 05:47:38 +00:00 |
|
Ian Pedowitz
|
8a03d88812
|
Merge "resolve merge conflicts of 695f21a661 to oc-dr1-dev" into oc-dr1-dev
am: be261948cb
Change-Id: I5f990815a7489828589303ee894ba3c94d6ef370
|
2017-06-08 05:46:25 +00:00 |
|
Sudheer Shanka
|
54a6869814
|
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev am: f34713066e
am: 736cb0e33a
Change-Id: Ia4ae2f57539d652e9a898e4eb62d6b1bbc0de06a
|
2017-06-08 05:45:37 +00:00 |
|
Sudheer Shanka
|
2bb4966dab
|
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am: f34713066e
Change-Id: Ic001bfa12fecb00b24d7170c841af21531bab28a
|
2017-06-08 05:44:49 +00:00 |
|
Ian Pedowitz
|
851bfc38d4
|
Merge "resolve merge conflicts of 7ea4f66f35 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
|
2017-06-08 05:42:24 +00:00 |
|
Ian Pedowitz
|
be261948cb
|
Merge "resolve merge conflicts of 695f21a661 to oc-dr1-dev" into oc-dr1-dev
|
2017-06-08 05:42:18 +00:00 |
|
Etan Cohen
|
d35a439a90
|
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
am: 89d6859dc4
Change-Id: Ib7dcbb63d9e41c8b9b3c702f883c84de06a23326
|
2017-06-08 05:32:09 +00:00 |
|
Etan Cohen
|
89d6859dc4
|
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
|
2017-06-08 05:26:21 +00:00 |
|
Felipe Leme
|
07d2221218
|
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am: 9be8c96918
Change-Id: I5cb2eb64772ea9f3fc189f629be0ddcd29fbe4d9
|
2017-06-08 05:25:17 +00:00 |
|
Felipe Leme
|
9be8c96918
|
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
|
2017-06-08 05:21:08 +00:00 |
|
Kevin Chyn
|
f0e1d6eab8
|
Add setting and permission for assist gesture
am: 4fddc9fa4d
Change-Id: Ife2ee905017b3a7489b4a338f6ebe59301301bd0
|
2017-06-08 04:53:31 +00:00 |
|
Mark Rathjen
|
53bdeb1a46
|
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am: 3492ed4376
Change-Id: I424396abf3e403abd1eec8a529b0b322019b7a01
|
2017-06-08 04:50:16 +00:00 |
|