OSDN Git Service
Makoto Onuki [Thu, 30 Mar 2017 15:27:53 +0000 (15:27 +0000)]
Merge "Show user running state in dumpsys user." into oc-dev am:
2692dafa9b
am:
60e6e538f9
Change-Id: Id37b0c99f10a2b6f9506778f600e3f98a234099c
Makoto Onuki [Thu, 30 Mar 2017 15:23:56 +0000 (15:23 +0000)]
Merge "Show user running state in dumpsys user." into oc-dev
am:
2692dafa9b
Change-Id: Id0b7b4fe09fe9165c9746b7906ce2247a59b7720
Makoto Onuki [Thu, 30 Mar 2017 15:18:25 +0000 (15:18 +0000)]
Merge "Show user running state in dumpsys user." into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 15:14:49 +0000 (15:14 +0000)]
Merge "Add comments to clarify how SkDrawable dtor is called"
Nicolas Geoffray [Thu, 30 Mar 2017 14:08:49 +0000 (14:08 +0000)]
Merge "Drop REASON_CORE_APP." into oc-dev am:
f451f7b05b
am:
31f7a2859b -s ours
Change-Id: Ice5c6b065d580e55ff2e6b8d9a670da4cb3a0c8c
Nicolas Geoffray [Thu, 30 Mar 2017 14:01:36 +0000 (14:01 +0000)]
Merge "Drop REASON_CORE_APP." into oc-dev
am:
f451f7b05b
Change-Id: I9b0063311a73f363c63501a96916e5b8c6f0f0e6
Nicolas Geoffray [Thu, 30 Mar 2017 13:54:29 +0000 (13:54 +0000)]
Merge "Drop REASON_CORE_APP." into oc-dev
Diego Perez [Thu, 30 Mar 2017 13:34:57 +0000 (13:34 +0000)]
Merge "Handle the case where no session exists" into oc-dev am:
261dd2305a
am:
cd190037af
Change-Id: Ic5271f342f90b5b4d5057bffe38def7a4a107b96
Diego Perez [Thu, 30 Mar 2017 13:30:17 +0000 (13:30 +0000)]
Merge "Handle the case where no session exists" into oc-dev
am:
261dd2305a
Change-Id: I36b6b77759b8bbfbccfd0801daccb8d4e0137a77
TreeHugger Robot [Thu, 30 Mar 2017 13:26:55 +0000 (13:26 +0000)]
Merge "Handle the case where no session exists" into oc-dev
Diego Perez [Thu, 30 Mar 2017 13:21:51 +0000 (13:21 +0000)]
Merge "Make layoutlib more lenient with recoverable errors" into oc-dev am:
3134462c5e
am:
510916c13f
Change-Id: I3c02fde71a2fc7b955b9ad124fe81eccf5a983a3
Diego Perez [Thu, 30 Mar 2017 13:17:29 +0000 (13:17 +0000)]
Merge "Make layoutlib more lenient with recoverable errors" into oc-dev
am:
3134462c5e
Change-Id: I1d522836d59f02c96ca96e74c0891c6763ef75d4
Diego Perez [Thu, 30 Mar 2017 13:12:34 +0000 (13:12 +0000)]
Merge "Make layoutlib more lenient with recoverable errors" into oc-dev
Nicolas Geoffray [Fri, 24 Mar 2017 15:13:38 +0000 (15:13 +0000)]
Drop REASON_CORE_APP.
After ensuring apps used by system server are speed compiled
on /system, we don't need a special reason anymore.
bug:
36532541
bug:
33799337
Test: m -j32 && boot
Change-Id: I1fb894f0f5b796cb9d59ed01a4afb2709c0f5496
(cherry picked from commit
b70e4bfe0776a3446ccfddd5a10b1ff155f60e34)
Nicolas Geoffray [Sun, 26 Mar 2017 13:31:34 +0000 (14:31 +0100)]
Drop REASON_SHARED_APK.
This reason was only used by "system shared libraries", not shared
APKs like GMS.
Code that uses this reason is now obsolete, as we do compile these shared
libraries when we see an apk that uses it.
bug:
33799337
Test: m -j32 && boot
Change-Id: I2eef22797551401a5c39ed339bc2486cf0d091a8
Nicolas Geoffray [Thu, 30 Mar 2017 11:53:28 +0000 (11:53 +0000)]
Merge changes Ic93fbcf4,I1fb894f0
* changes:
Drop REASON_NON_SYSTEM_LIBRARY.
Drop REASON_CORE_APP.
Wale Ogunwale [Thu, 30 Mar 2017 11:34:08 +0000 (11:34 +0000)]
Merge "Correctly blame ANR on process using another process token" into oc-dev am:
921daeed2f
am:
860732e495
Change-Id: Ic249da944216aae8a6582b9d5d4648c4d9ea83b4
Wale Ogunwale [Thu, 30 Mar 2017 11:30:19 +0000 (11:30 +0000)]
Merge "Correctly blame ANR on process using another process token" into oc-dev
am:
921daeed2f
Change-Id: I37f36e68ea0ebf2e462ecffba8ddf03ee13940e5
TreeHugger Robot [Thu, 30 Mar 2017 11:25:03 +0000 (11:25 +0000)]
Merge "Correctly blame ANR on process using another process token" into oc-dev
Diego Perez [Mon, 27 Mar 2017 14:14:45 +0000 (15:14 +0100)]
Handle the case where no session exists
In some cases, if an error happens, no session will exist in
BridgeRenderSession.
Test: Added small regression test
Change-Id: Ic9be381767626766395c65044542c197ed7649e7
Diego Perez [Wed, 29 Mar 2017 16:20:01 +0000 (17:20 +0100)]
Make layoutlib more lenient with recoverable errors
In many cases, throwing an exception will stop the inflation or
rendering of a layout. Sometimes, we could recover from some of the
failures and render a layout that is "usable".
I've done a first pass trying to follow the following rules:
- Try simple recoveries by choosing sensible defaults. Not trying
complex recoveries.
- Only recover if the exception is not part of the class behaviour.
Avoided removing declared exceptions or exceptions that are expected by
the framework.
- I've kept assertions in place so, in most cases, the behaviour will
be almost identical to the previous one with assertions enabled.
Test: Checked with existing tests
Change-Id: I0001fdd3c808cf405c4eb8d734b9bbe63493e05c
Sudheer Shanka [Thu, 30 Mar 2017 07:47:55 +0000 (07:47 +0000)]
Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev am:
8c85b1d0b7
am:
abed833af1
Change-Id: I2dc30715a2022eb6903b77643afae6eaa0ce3647
Sudheer Shanka [Thu, 30 Mar 2017 07:43:32 +0000 (07:43 +0000)]
Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev
am:
8c85b1d0b7
Change-Id: Ic36c9e2220e3d8b3fca408067e0c0cfa1eb99f45
Sudheer Shanka [Thu, 30 Mar 2017 07:38:05 +0000 (07:38 +0000)]
Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev
Nathan Harold [Thu, 30 Mar 2017 03:51:47 +0000 (03:51 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am:
d118826971 am:
6d3c10495e am:
81d48a99e0
am:
949d1353e9
Change-Id: I86d5e1c019336707f7d3f1102aaca52a91dea310
Nathan Harold [Thu, 30 Mar 2017 03:48:20 +0000 (03:48 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am:
d118826971 am:
6d3c10495e
am:
81d48a99e0
Change-Id: I941ee00099df0afdbce94b73c1bd81c246fac1e8
Sudheer Shanka [Thu, 30 Mar 2017 03:46:30 +0000 (20:46 -0700)]
Fix flaky tests in NetworkPolicyManagerServiceTest.
Test: runtest -c com.android.server.NetworkPolicyManagerServiceTest frameworks-services
Change-Id: I0a6f0d11e3922bfeb2bd3784f23e10ae45e5e40c
Nathan Harold [Thu, 30 Mar 2017 03:44:12 +0000 (03:44 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am:
d118826971
am:
6d3c10495e
Change-Id: If826b05dea2d3c14137ee5e34449b6d39af6cc10
Nathan Harold [Thu, 30 Mar 2017 03:39:46 +0000 (03:39 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
am:
d118826971
Change-Id: Ie59322c4e80aab89d784a2fcb3edd6458677bbb7
Jakub Pawlowski [Thu, 30 Mar 2017 03:39:45 +0000 (03:39 +0000)]
Merge "Hide periodic scanning" am:
ca7544ea15 am:
c06722e788 am:
c809a5b12b
am:
f96f05b108
Change-Id: Ic65fa3ef68543405c1075c03079a4c5fa53ade4f
Jakub Pawlowski [Thu, 30 Mar 2017 03:35:53 +0000 (03:35 +0000)]
Merge "Hide periodic scanning" am:
ca7544ea15 am:
c06722e788
am:
c809a5b12b
Change-Id: I218f37b60aa5cfd4c427663b83807ffce2cfa11b
Treehugger Robot [Thu, 30 Mar 2017 03:33:12 +0000 (03:33 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
Jakub Pawlowski [Thu, 30 Mar 2017 03:30:42 +0000 (03:30 +0000)]
Merge "Hide periodic scanning" am:
ca7544ea15
am:
c06722e788
Change-Id: Ie0f3b4d162bec0a501f56f2324fec1c7d2ccbda7
Jakub Pawlowski [Thu, 30 Mar 2017 03:26:18 +0000 (03:26 +0000)]
Merge "Hide periodic scanning"
am:
ca7544ea15
Change-Id: Icedae1d34de063d6b708a30bdc6217d48ed373ef
Jakub Pawlowski [Thu, 30 Mar 2017 03:17:48 +0000 (03:17 +0000)]
Merge "Hide periodic scanning"
Michael Plass [Thu, 30 Mar 2017 03:10:13 +0000 (03:10 +0000)]
Merge "Cherry-pick: Remove implementation of bssid hotlist" into oc-dev am:
859789061f
am:
1a322e7d14
Change-Id: Icee72301731c58f4babe121feb815de7c5fea557
Michael Plass [Thu, 30 Mar 2017 03:05:12 +0000 (03:05 +0000)]
Merge "Cherry-pick: Remove implementation of bssid hotlist" into oc-dev
am:
859789061f
Change-Id: I7e04832c58e9a42485cbd844d2cd741a8091cce2
TreeHugger Robot [Thu, 30 Mar 2017 02:58:35 +0000 (02:58 +0000)]
Merge "Cherry-pick: Remove implementation of bssid hotlist" into oc-dev
Ta-wei Yen [Thu, 30 Mar 2017 02:05:06 +0000 (02:05 +0000)]
Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev am:
dfbc8517ee
am:
904e1856a7
Change-Id: I2066d699def9e921df3a2fd12a709a01b5e7795a
Ta-wei Yen [Thu, 30 Mar 2017 01:58:40 +0000 (01:58 +0000)]
Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev
am:
dfbc8517ee
Change-Id: I346365749cc6309cb1f2905f91ea9bac143519f0
Android Build Merger (Role) [Thu, 30 Mar 2017 01:56:00 +0000 (01:56 +0000)]
Merge "Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev am:
33813bd439 am:
6869c55106"
TreeHugger Robot [Thu, 30 Mar 2017 01:55:05 +0000 (01:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Romain Guy [Thu, 30 Mar 2017 01:53:07 +0000 (01:53 +0000)]
Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev am:
33813bd439
am:
6869c55106
Change-Id: I69b4e1ba160032255891fbb2656445badd5b936e
TreeHugger Robot [Thu, 30 Mar 2017 01:51:51 +0000 (01:51 +0000)]
Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev
Romain Guy [Thu, 30 Mar 2017 01:48:42 +0000 (01:48 +0000)]
Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev
am:
33813bd439
Change-Id: I5862310360b3532b5c59eda6bae95e8922e0bb08
Bill Yi [Thu, 30 Mar 2017 01:46:23 +0000 (01:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
5acdc8c3d5 -s ours
am:
bcd06fab1d -s ours
Change-Id: If192805c88157baf69e8be9c55009145648b5e63
George Mount [Thu, 30 Mar 2017 01:42:59 +0000 (01:42 +0000)]
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev am:
ce3cf36652
am:
b81f36bb72
Change-Id: Ia3c9fe24b6a9aec4d2549668689efde46f3ee577
Romain Guy [Thu, 30 Mar 2017 01:42:25 +0000 (01:42 +0000)]
Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev
Bill Yi [Thu, 30 Mar 2017 01:40:45 +0000 (01:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
5acdc8c3d5 -s ours
Change-Id: I86df56325e5d9aa00bd4b1c5cfa1f85123cec1c6
George Mount [Thu, 30 Mar 2017 01:37:30 +0000 (01:37 +0000)]
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
am:
ce3cf36652
Change-Id: I4ebe9cd31732ea45e77e6bb0a640160a90c910b0
TreeHugger Robot [Thu, 30 Mar 2017 01:30:06 +0000 (01:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Pavlin Radoslavov [Thu, 30 Mar 2017 01:26:37 +0000 (01:26 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev am:
4e7bc119ae
am:
7a776f03a1
Change-Id: I6203f2cd4b83537f8c19ca308f6399182408b881
TreeHugger Robot [Thu, 30 Mar 2017 01:26:09 +0000 (01:26 +0000)]
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
Pavlin Radoslavov [Thu, 30 Mar 2017 01:22:32 +0000 (01:22 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
am:
4e7bc119ae
Change-Id: I8bf6233fe843a13b0e49e6abc5bd490159442185
TreeHugger Robot [Thu, 30 Mar 2017 01:17:20 +0000 (01:17 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
Evan Rosky [Thu, 30 Mar 2017 01:15:46 +0000 (01:15 +0000)]
Merge "Expose initial focus feature flag for testing" into oc-dev am:
7ac3fb2282
am:
f99eb172ae
Change-Id: I5bdc2a3617ab3cad61a00b495b724af8426c37c7
Evan Rosky [Thu, 30 Mar 2017 01:10:25 +0000 (01:10 +0000)]
Merge "Expose initial focus feature flag for testing" into oc-dev
am:
7ac3fb2282
Change-Id: I615222fa4f1ee33c977daf771a15495e7771d2ca
Evan Rosky [Thu, 30 Mar 2017 01:02:22 +0000 (01:02 +0000)]
Merge "Expose initial focus feature flag for testing" into oc-dev
Abhijith Shastry [Thu, 30 Mar 2017 00:48:01 +0000 (00:48 +0000)]
Merge "Update injectSmsPdu documentation." into oc-dev am:
13dbbaf50a
am:
c8d771593a
Change-Id: Ia09b57636a3092b4c6b9af77126bbca72ac7da70
Nathan Harold [Wed, 29 Mar 2017 17:47:59 +0000 (10:47 -0700)]
Change reserveSecurityParameterIndex() to take a remoteAddress
To make the SPI reservation more semantically consistent with the
transform creation API, and to ensure that we always create SPI
reservations relative to a well-known remote, we should take the
SPI request relative to a remote (rather than to a destination).
This necessitates that we now consider direction separately, which
is used for keying the SA-Id.
Bug:
36073210
Test: compilation
Change-Id: I81e955c20128c1f8e04fd68eb26669561f827a78
Adam Lesinski [Thu, 30 Mar 2017 00:41:25 +0000 (00:41 +0000)]
Merge "AAPT2: Parse an ID encoded as a map" into oc-dev am:
c26ace0754
am:
719349cdb3
Change-Id: Icab08b15c92a8b88b7348e0caf61dba2f025de1b
Abhijith Shastry [Thu, 30 Mar 2017 00:40:30 +0000 (00:40 +0000)]
Merge "Update injectSmsPdu documentation." into oc-dev
am:
13dbbaf50a
Change-Id: I6174713b7b9a2b51bca56ffe680a00d0591a35dd
Adam Lesinski [Thu, 30 Mar 2017 00:40:28 +0000 (00:40 +0000)]
Merge "AAPT2: Allow arbitrary entry names with aapt2 optimize" into oc-dev am:
86cb762ae6
am:
78b5fad19e
Change-Id: Id2bef485de9c4bf90e12846cc80a32da109cd26d
Adam Lesinski [Thu, 30 Mar 2017 00:36:24 +0000 (00:36 +0000)]
Merge "AAPT2: Parse an ID encoded as a map" into oc-dev
am:
c26ace0754
Change-Id: I5e2aba17860b27cd5f27d4b73c65775a74630881
TreeHugger Robot [Thu, 30 Mar 2017 00:35:57 +0000 (00:35 +0000)]
Merge "Update injectSmsPdu documentation." into oc-dev
Adam Lesinski [Thu, 30 Mar 2017 00:35:29 +0000 (00:35 +0000)]
Merge "AAPT2: Allow arbitrary entry names with aapt2 optimize" into oc-dev
am:
86cb762ae6
Change-Id: Id175edab5f98cb062731c7d4064006f56f991a6d
Evan Rosky [Thu, 30 Mar 2017 00:33:51 +0000 (00:33 +0000)]
Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev am:
37af93ad1c
am:
85aa3e82c7
Change-Id: I04c41ec0fa58d62e5f31c373b541e5dad57af184
Adam Lesinski [Thu, 30 Mar 2017 00:30:58 +0000 (00:30 +0000)]
Merge "AAPT2: Parse an ID encoded as a map" into oc-dev
Adam Lesinski [Thu, 30 Mar 2017 00:30:28 +0000 (00:30 +0000)]
Merge "AAPT2: Allow arbitrary entry names with aapt2 optimize" into oc-dev
Evan Rosky [Thu, 30 Mar 2017 00:29:48 +0000 (00:29 +0000)]
Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev
am:
37af93ad1c
Change-Id: I92254792b7681d1be53849ad3847dbb4e5318139
Evan Rosky [Thu, 30 Mar 2017 00:22:36 +0000 (00:22 +0000)]
Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev
Android Build Merger (Role) [Thu, 30 Mar 2017 00:19:28 +0000 (00:19 +0000)]
Merge "Merge "Remove implementation of bssid hotlist" am:
62c5f64fa5 am:
37a1d983fe am:
7b4d1bbacc am:
70b93740c2"
TreeHugger Robot [Thu, 30 Mar 2017 00:18:48 +0000 (00:18 +0000)]
Merge "Add a service to rank apps for ResolverActivity."
Michael Plass [Thu, 30 Mar 2017 00:18:34 +0000 (00:18 +0000)]
Merge "Remove implementation of bssid hotlist" am:
62c5f64fa5 am:
37a1d983fe am:
7b4d1bbacc
am:
70b93740c2
Change-Id: I13f2d13304b08e06a6ca4cd1dd25c512562113de
Nathan Harold [Thu, 30 Mar 2017 00:15:17 +0000 (00:15 +0000)]
Merge commit '
e45e328821ba' into oc-dev-plus-aosp
am:
560c9ec724
Change-Id: I136c31aa5b27a3520c93141d91d6198e2dae3a1d
Michael Plass [Thu, 30 Mar 2017 00:14:00 +0000 (00:14 +0000)]
Merge "Remove implementation of bssid hotlist" am:
62c5f64fa5 am:
37a1d983fe
am:
7b4d1bbacc
Change-Id: I1cc13641f08367784c772a08ec5aeffba08ea207
Jakub Pawlowski [Thu, 30 Mar 2017 00:00:44 +0000 (17:00 -0700)]
Hide periodic scanning
Bug:
30622771
Test: manual
Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c
Robert Greenwalt [Thu, 30 Mar 2017 00:05:16 +0000 (00:05 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" into oc-dev am:
8931dc5d2f
am:
fb0ad3705d
Change-Id: I95c9d5d180b562664fbe6c78c4df9eb0a66c516b
Nathan Harold [Thu, 30 Mar 2017 00:05:10 +0000 (17:05 -0700)]
Merge commit '
e45e328821ba' into oc-dev-plus-aosp
Change-Id: I30ad9038be8faee57e5d6b1391d9e70a966a9a77
Michael Plass [Thu, 30 Mar 2017 00:02:58 +0000 (00:02 +0000)]
Merge "Remove implementation of bssid hotlist" am:
62c5f64fa5
am:
37a1d983fe
Change-Id: I546410e5a0efbbdddee526cd494ba33a6eb1005b
Robert Greenwalt [Thu, 30 Mar 2017 00:00:08 +0000 (00:00 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" into oc-dev
am:
8931dc5d2f
Change-Id: I1866dd1f0f44dd6653c1d8c9618f04386a172888
Michael Plass [Mon, 27 Mar 2017 18:11:47 +0000 (11:11 -0700)]
Cherry-pick: Remove implementation of bssid hotlist
Test: Relevant unit tests pass
Bug:
30147676
Change-Id: I268907cc13ef21c0ba547722fe7c866ee4cdae5a
Michael Plass [Wed, 29 Mar 2017 23:57:32 +0000 (23:57 +0000)]
Merge "Remove implementation of bssid hotlist"
am:
62c5f64fa5
Change-Id: I3744706b984da6ed123a4eea08312c75806adb8f
Nathan Harold [Wed, 29 Mar 2017 23:56:06 +0000 (23:56 +0000)]
Merge commit '
ce073d70bedc' into stage-aosp-master
am:
4fdc7d5ddd
Change-Id: I4bde8eedc986900096fc8429da2b195f907605c9
Robert Greenwalt [Wed, 29 Mar 2017 23:53:17 +0000 (23:53 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" into oc-dev
Makoto Onuki [Wed, 29 Mar 2017 23:52:03 +0000 (16:52 -0700)]
Show user running state in dumpsys user.
Test: Manual test with: watch adb shell dumpsys user
Change-Id: I38f36331b95e2602b09d60bee75a65f62cf85a86
Treehugger Robot [Wed, 29 Mar 2017 23:50:01 +0000 (23:50 +0000)]
Merge "Remove implementation of bssid hotlist"
Chad Brubaker [Wed, 29 Mar 2017 23:40:03 +0000 (23:40 +0000)]
Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev am:
84eecd2532
am:
ba18f8674e
Change-Id: I2ad78d3d0fb98a68c25647b29afd5ba9cd759b97
Makoto Onuki [Wed, 29 Mar 2017 23:38:58 +0000 (23:38 +0000)]
Merge "Mention <intent> can't have string resources." into oc-dev am:
6c3e92bbe9
am:
d76076a103
Change-Id: I4b529623ca5169e4f56efa9d9d23d55f9307a829
Aaron Whyte [Wed, 29 Mar 2017 23:34:16 +0000 (23:34 +0000)]
Merge "Split scroll factor into a 2d float."
Chad Brubaker [Wed, 29 Mar 2017 23:33:48 +0000 (23:33 +0000)]
Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev
am:
84eecd2532
Change-Id: Ib297fcfe2f6bff079a4325420bc8b62a5f29bd55
Makoto Onuki [Wed, 29 Mar 2017 23:32:54 +0000 (23:32 +0000)]
Merge "Mention <intent> can't have string resources." into oc-dev
am:
6c3e92bbe9
Change-Id: I7f4a77fd3dd98955ad4f6e88b6471d72190a3977
TreeHugger Robot [Wed, 29 Mar 2017 23:25:54 +0000 (23:25 +0000)]
Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev
Tony Mak [Wed, 29 Mar 2017 23:24:58 +0000 (23:24 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev am:
fc1dd04b0b
am:
742d336461
Change-Id: I5b325c62cc442b1f94d0770ca9ac8100045211ad
TreeHugger Robot [Wed, 29 Mar 2017 23:24:38 +0000 (23:24 +0000)]
Merge "Mention <intent> can't have string resources." into oc-dev
Tony Mak [Wed, 29 Mar 2017 23:21:23 +0000 (23:21 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev
am:
fc1dd04b0b
Change-Id: I69b3c9fed0cc52b7a500f05a2ca8cd9fe3d0cc36
TreeHugger Robot [Wed, 29 Mar 2017 23:12:38 +0000 (23:12 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev
Nathan Harold [Wed, 29 Mar 2017 23:03:34 +0000 (16:03 -0700)]
Merge commit '
ce073d70bedc' into stage-aosp-master
Change-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b
Pavlin Radoslavov [Wed, 29 Mar 2017 23:04:01 +0000 (23:04 +0000)]
Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579 am:
25105f6561 am:
dfc1264eff" into oc-dev-plus-aosp
am:
7035d9a920
Change-Id: I97a0ca52a8e1d2dbccb9ff2263eec62772358df6
Jason Monk [Wed, 29 Mar 2017 23:00:30 +0000 (23:00 +0000)]
Merge "Fix battery warning color lookup" into oc-dev am:
834c260e98
am:
cedc7dfc2e
Change-Id: I544b92f15cc490845b24e429354f45bec8b45bc4