OSDN Git Service
Paul Mclean [Thu, 27 Aug 2015 19:42:30 +0000 (19:42 +0000)]
am
f706adbe: am
624037df: (-s ours) am
a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev
* commit '
f706adbe653fb18bde5af17dfcd15e725ecfbf97':
Paul Mclean [Thu, 27 Aug 2015 19:42:20 +0000 (19:42 +0000)]
am
e4c060bb: am
ef23eb24: (-s ours) am
beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev
* commit '
e4c060bbbc40d6eedbb93102c2dc79187c9b5396':
Svetoslav Ganov [Thu, 27 Aug 2015 19:42:10 +0000 (19:42 +0000)]
am
9fb4323c: am
8a23ad62: (-s ours) am
90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
* commit '
9fb4323cbfd2cf2fa88afb056a99f9984305c29a':
Dianne Hackborn [Thu, 27 Aug 2015 19:42:02 +0000 (19:42 +0000)]
am
8a58c18e: am
416605e4: (-s ours) am
fc81be94: Merge "Fix issue #
23037093: "Write system settings" permission value fails..." into mnc-dev
* commit '
8a58c18e88b6db9ef27f0e5c5e040b02a9eebac4':
Billy Lau [Thu, 27 Aug 2015 19:41:53 +0000 (19:41 +0000)]
am
62cd2aa6: am
199edc5c: (-s ours) am
70f998e5: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
62cd2aa6ca1ecf98043c59c1c077c0eebf709f05':
Dianne Hackborn [Thu, 27 Aug 2015 19:41:43 +0000 (19:41 +0000)]
am
7a9a1140: am
10faec4b: (-s ours) am
f0e5501e: Merge "Fix issue #
22989030: Separate battery whitelists" into mnc-dev
* commit '
7a9a1140220a692a37039c76fd227ebbf21e65aa':
Matthew Williams [Thu, 27 Aug 2015 19:41:31 +0000 (19:41 +0000)]
am
5f02146c: am
6dc2ac39: (-s ours) am
9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev
* commit '
5f02146c82c57ba85d7d900fe0e28d0aa8f910c4':
Neil Fuller [Thu, 27 Aug 2015 19:41:11 +0000 (19:41 +0000)]
am
02bffbf1: am
cf9b8251: (-s ours) am
14b884c1: am
daf8d905: Merge "Add ICU as a java library for docs."
* commit '
02bffbf14cfb348aa9fa2ba1fb6d48e3edfd232a':
Shirish Kalele [Thu, 27 Aug 2015 19:40:52 +0000 (19:40 +0000)]
am
c50175b4: am
1451df28: (-s ours) am
027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev
* commit '
c50175b44100eac5193571f5828ab608d2bbf58b':
Nicolas Prévot [Thu, 27 Aug 2015 19:40:30 +0000 (19:40 +0000)]
am
40fa5e7b: am
d63cb337: (-s ours) am
288e82f8: Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev
* commit '
40fa5e7b6606863ef5e6dccd1d4f68667f84c259':
Julia Reynolds [Thu, 27 Aug 2015 19:40:09 +0000 (19:40 +0000)]
am
bf085a8e: am
936d2022: (-s ours) am
9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev
* commit '
bf085a8e12b174c2671abc6ab0d3cf6755a5e64a':
Jason Monk [Thu, 27 Aug 2015 19:40:01 +0000 (19:40 +0000)]
am
74bd71be: am
59769181: (-s ours) am
69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '
74bd71bebef0e55ee61cc3023e29d444e80ca365':
Amith Yamasani [Thu, 27 Aug 2015 19:39:54 +0000 (19:39 +0000)]
am
914c176f: am
d512325a: (-s ours) am
1fbc1b3b: Merge "Fix partial user cleanup on restart" into mnc-dev
* commit '
914c176fc6e78586c4d800971342ac8963977540':
Chris Tate [Thu, 27 Aug 2015 19:39:46 +0000 (19:39 +0000)]
am
992de812: am
d39fb4af: (-s ours) am
c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev
* commit '
992de812889492a7bad5f62aa6408a7190396308':
Dianne Hackborn [Thu, 27 Aug 2015 19:39:38 +0000 (19:39 +0000)]
am
7b362749: am
0e8b4fa0: (-s ours) am
3d06ea03: Merge "Debugging for issue #
22556778: Starting under voice control not allowed" into mnc-dev
* commit '
7b362749f6f810870afe6a7dc185af7907efbc0b':
Dianne Hackborn [Thu, 27 Aug 2015 19:39:31 +0000 (19:39 +0000)]
am
4e465dad: am
207c6908: (-s ours) am
53d6cddb: Merge "Fix issue #
22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev
* commit '
4e465dad5b7240d4d0e585330e6155d6a5a28f75':
Michael Wright [Thu, 27 Aug 2015 19:39:23 +0000 (19:39 +0000)]
am
b5d4f689: (-s ours) am
56700e24: (-s ours) am
d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev
* commit '
b5d4f689d11afa2c0d7a1c6691afc56fdd23d6c1':
Svetoslav Ganov [Thu, 27 Aug 2015 19:39:13 +0000 (19:39 +0000)]
am
b9f94678: am
c9d50277: (-s ours) am
38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
* commit '
b9f946789fea8431a0a73cd8574bc787d26e7c35':
Jason Monk [Thu, 27 Aug 2015 19:39:05 +0000 (19:39 +0000)]
am
cc828be1: am
0607e785: (-s ours) am
77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev
* commit '
cc828be1e1df500e878aff950ccf2a3cfeef786c':
Jeff Davidson [Thu, 27 Aug 2015 19:38:55 +0000 (19:38 +0000)]
am
4e042473: am
393a27c8: (-s ours) am
1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev
* commit '
4e0424734b03dc6852c0b026e7a80e19bc325a4b':
Wale Ogunwale [Thu, 27 Aug 2015 19:38:44 +0000 (19:38 +0000)]
am
3504fe1d: am
6b415901: (-s ours) am
a0ef49c4: Look for recent tasks in live stacks.
* commit '
3504fe1dc8cf97f82a862e1364af3e000d84ca0b':
Deepanshu Gupta [Thu, 27 Aug 2015 19:38:30 +0000 (19:38 +0000)]
am
a567cf55: am
5cb02008: (-s ours) am
8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev
* commit '
a567cf551d51624c25e9d2fdbd34974d2e8761f1':
Deepanshu Gupta [Thu, 27 Aug 2015 19:38:20 +0000 (19:38 +0000)]
am
4665be96: am
1cf52f6b: (-s ours) am
385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev
* commit '
4665be962165a570f677fc3d2e8c1a0a89521fc0':
Andres Morales [Thu, 27 Aug 2015 19:38:08 +0000 (19:38 +0000)]
am
a1f50520: am
84fd6e97: (-s ours) am
85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev
* commit '
a1f5052017c27ee497a1ec9ec403e521942a2f14':
Winson Chung [Thu, 27 Aug 2015 19:37:58 +0000 (19:37 +0000)]
am
2e61f63c: am
342b2044: (-s ours) am
bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev
* commit '
2e61f63cd327bdcb0c3ff353fdecec294c271770':
Wei Jia [Thu, 27 Aug 2015 19:37:49 +0000 (19:37 +0000)]
am
ccf080d7: am
7e758862: (-s ours) am
a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev
* commit '
ccf080d76a1d5efeea0bc5e6594512c8f41bb0f2':
Jeff Sharkey [Thu, 27 Aug 2015 19:37:41 +0000 (19:37 +0000)]
am
04e49fcb: am
3d4f4b33: (-s ours) am
cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev
* commit '
04e49fcbb2bc4c27fc70b60308393456a9515f66':
Chris Wren [Thu, 27 Aug 2015 19:37:34 +0000 (19:37 +0000)]
am
95cfc8ba: am
816f07bc: (-s ours) am
93f3fc87: Merge "add metrics to assistant" into mnc-dev
* commit '
95cfc8ba348f10f725b1a0dac7d4f2461b20e60d':
Benjamin Franz [Thu, 27 Aug 2015 19:37:27 +0000 (19:37 +0000)]
am
8154107d: am
dfa85910: (-s ours) am
339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev
* commit '
8154107da13d21e46f4db2a53aa7e2622681ad70':
Svetoslav Ganov [Thu, 27 Aug 2015 19:37:19 +0000 (19:37 +0000)]
am
d3888536: am
80dc28e7: (-s ours) am
38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev
* commit '
d38885367788bc7fb4b5cc6d8c49a118797532a3':
Paul Mclean [Thu, 27 Aug 2015 19:37:15 +0000 (19:37 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Paul Mclean [Thu, 27 Aug 2015 19:37:03 +0000 (19:37 +0000)]
am
0cd7284c: am
0c3c81ef: (-s ours) am
af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev
* commit '
0cd7284cc0cb265c422762484541bdb279216237':
Doris Liu [Thu, 27 Aug 2015 19:37:03 +0000 (19:37 +0000)]
Merge "Internal cleanup for Animator framework"
Paul Mclean [Thu, 27 Aug 2015 19:36:52 +0000 (19:36 +0000)]
am
a9b0ecda: am
9048088d: (-s ours) am
c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev
* commit '
a9b0ecdaadfb6f970c7b9670a3e3f98eaac48939':
Alan Viverette [Thu, 27 Aug 2015 19:36:36 +0000 (19:36 +0000)]
am
4a541c3f: am
ad853777: (-s ours) am
c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit '
4a541c3fa1a7a64c699155e187233c9a28851361':
Dianne Hackborn [Thu, 27 Aug 2015 19:36:15 +0000 (19:36 +0000)]
am
893f7a6f: am
aa8daf78: (-s ours) am
6b0f1e78: Merge "Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '
893f7a6f84effe3d8598fdfaed19ee08edda1bab':
Chet Haase [Thu, 27 Aug 2015 19:36:00 +0000 (19:36 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
Chet Haase [Thu, 27 Aug 2015 19:35:46 +0000 (19:35 +0000)]
am
20b5c41a: am
26762506: (-s ours) am
da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit '
20b5c41ada35869790d9423525aaf9a72317cead':
Alan Viverette [Thu, 27 Aug 2015 19:35:36 +0000 (19:35 +0000)]
Merge "Expose password text to accessibility services, if requested"
Alan Treadway [Thu, 27 Aug 2015 19:35:23 +0000 (19:35 +0000)]
am
3f1c3098: am
e4b8c760: (-s ours) am
190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '
3f1c3098d24d8351729c7932b89e3ff1a4b27632':
Michael Wright [Thu, 27 Aug 2015 19:35:08 +0000 (19:35 +0000)]
am
bfb910fe: am
46b7af57: (-s ours) am
d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit '
bfb910febbfd637f6f04aecc50183ad715e2256a':
Michael Wright [Thu, 27 Aug 2015 19:34:50 +0000 (19:34 +0000)]
am
bb1c5fd7: am
7a125e45: (-s ours) am
eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev
* commit '
bb1c5fd71708dc0cf8967db51170c3d9437cdba2':
Julia Reynolds [Thu, 27 Aug 2015 19:34:26 +0000 (19:34 +0000)]
am
4c2fb49a: am
24d7c503: (-s ours) am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
4c2fb49a324e234a1dca7bab462ba93c4b7aec49':
Geoff Mendal [Thu, 27 Aug 2015 19:34:09 +0000 (19:34 +0000)]
am
9825ec9c: (-s ours) am
307be111: (-s ours) am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
9825ec9ccdd3f52cf8a3e7fc92256333ab363896':
Mitchell Wills [Thu, 27 Aug 2015 19:33:57 +0000 (19:33 +0000)]
am
30633875: am
088c8de2: (-s ours) am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
3063387593a1f31e8ad03d0352df3315b6575266':
Yusuke Sato [Thu, 27 Aug 2015 19:33:40 +0000 (19:33 +0000)]
am
28cfabad: am
e15a5871: (-s ours) am
61234dea: am
bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
* commit '
28cfabad3530a98aebe1166633adf9a4f2d33d0c':
Amit Mahajan [Thu, 27 Aug 2015 19:33:26 +0000 (19:33 +0000)]
am
80b62754: am
96e2975c: (-s ours) am
be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit '
80b62754598a5e94b00782e851fb0d5d1d3db85f':
Jim Miller [Thu, 27 Aug 2015 19:33:07 +0000 (19:33 +0000)]
am
a2660d09: am
a950fe0a: (-s ours) am
120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '
a2660d09221c72967fb8b0e07d01c0dfdb052f37':
Yorke Lee [Thu, 27 Aug 2015 19:32:45 +0000 (19:32 +0000)]
am
c8cd404d: am
3d98e175: (-s ours) am
f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev
* commit '
c8cd404d33f5368a3a0db372acf0024de4ed0f48':
Yusuke Sato [Thu, 27 Aug 2015 19:32:23 +0000 (19:32 +0000)]
am
48f597c8: am
c1efd41f: (-s ours) Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)
* commit '
48f597c8043a46ed1098612f696fa224428f975a':
Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)
Deepanshu Gupta [Thu, 27 Aug 2015 19:32:02 +0000 (19:32 +0000)]
am
21a9d14e: am
63cd28af: (-s ours) am
2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev
* commit '
21a9d14e4f11d8170410e242f541039c1d76cdbb':
Paul Mclean [Thu, 27 Aug 2015 19:31:42 +0000 (19:31 +0000)]
am
ecc21222: am
f89aedbf: (-s ours) am
8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev
* commit '
ecc212228a15d493d756b37820b9118fd0f01eb9':
Phil Burk [Thu, 27 Aug 2015 19:31:20 +0000 (19:31 +0000)]
am
c7f65fa9: am
047fe2a7: (-s ours) am
881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev
* commit '
c7f65fa9579367ed62b0577a5e8877d2696a9b34':
Vladislav Kaznacheev [Thu, 27 Aug 2015 19:30:57 +0000 (19:30 +0000)]
am
361f6c48: am
af0a6184: (-s ours) am
8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev
* commit '
361f6c48529557e57e3d1dc2aa64998ca581968a':
Yusuke Sato [Thu, 27 Aug 2015 19:30:31 +0000 (19:30 +0000)]
am
eb9ddfe3: am
eb24da62: (-s ours) am
3383b141: am
a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"
* commit '
eb9ddfe34f3fc679367d9552d7f508b28057f6fd':
Yohei Yukawa [Thu, 27 Aug 2015 19:30:06 +0000 (19:30 +0000)]
am
6475f6ac: am
3c9ec351: (-s ours) am
db221acc: Merge "Reduce log spam for the ease of debugging Bug
22857361." into mnc-dev
* commit '
6475f6ac06410a04c6bdeb95e2e54d25ce457d0c':
Ajay Panicker [Thu, 27 Aug 2015 19:29:51 +0000 (19:29 +0000)]
am
6b72c433: am
7324b151: (-s ours) am
cda6e878: Implement Bluetooth settings factory reset (2/5)
* commit '
6b72c4339621bc2482df5b08e57a36e14f731aa5':
Svetoslav Ganov [Thu, 27 Aug 2015 19:29:35 +0000 (19:29 +0000)]
am
fec8832c: am
69abbe45: (-s ours) am
e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev
* commit '
fec8832c8a8e95fd2d0253e3b1159079ec0cf8ca':
Mitchell Wills [Thu, 27 Aug 2015 19:29:16 +0000 (19:29 +0000)]
am
6e43c3bd: am
701a36d5: (-s ours) am
bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev
* commit '
6e43c3bd1a1d0834a39641dd01a0c7b6671a733c':
Rubin Xu [Thu, 27 Aug 2015 19:29:04 +0000 (19:29 +0000)]
am
8fd6ef0f: am
16c4e75e: (-s ours) am
ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev
* commit '
8fd6ef0fcfd6ff9464e28808e3140a7a7c5ac334':
Makoto Onuki [Thu, 27 Aug 2015 19:28:47 +0000 (19:28 +0000)]
am
71c86de7: am
fe6964e4: (-s ours) am
86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev
* commit '
71c86de737b9490328c564ef1b957213fe6af518':
Niels Egberts [Thu, 27 Aug 2015 19:28:36 +0000 (19:28 +0000)]
am
a1251eed: am
94b5278e: (-s ours) am
6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev
* commit '
a1251eed7233979f6522d69bead91a5f2f669342':
Ian Pedowitz [Thu, 27 Aug 2015 19:28:21 +0000 (19:28 +0000)]
am
6fef40bd: am
df27f4b4: (-s ours) am
df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev
* commit '
6fef40bd2628e38744fc4be4a9409be4516d2dac':
Paul Jensen [Thu, 27 Aug 2015 19:28:10 +0000 (19:28 +0000)]
am
5f78a07b: am
66625ff1: (-s ours) am
dbc4edcc: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
* commit '
5f78a07bd94d3f7824eac0caa383d8d21d9b8af8':
Roozbeh Pournader [Thu, 27 Aug 2015 19:27:58 +0000 (19:27 +0000)]
am
de7d268e: am
e32d00aa: (-s ours) am
519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev
* commit '
de7d268eadd7d1397567ce147f076ea9e16fdc92':
xin He [Thu, 27 Aug 2015 19:27:48 +0000 (19:27 +0000)]
am
ecd86797: am
5e5ac5d8: (-s ours) am
54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev
* commit '
ecd86797691d95ed297a1f8a25408e597f670c89':
Jae Seo [Thu, 27 Aug 2015 19:27:37 +0000 (19:27 +0000)]
am
66fb4bcb: am
ea0483c4: (-s ours) am
2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev
* commit '
66fb4bcb5e7213ac8af8005c9190153fb79e9a50':
Jeff Sharkey [Thu, 27 Aug 2015 19:27:25 +0000 (19:27 +0000)]
am
94f8f931: am
b6117765: (-s ours) am
0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev
* commit '
94f8f9318fdf70e7964348d832b64d786e60a4f7':
Filip Gruszczynski [Thu, 27 Aug 2015 19:27:12 +0000 (19:27 +0000)]
am
ef9afd2f: am
cae230a4: (-s ours) am
52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev
* commit '
ef9afd2fa1d933ce187d1bfc6fa723e881fad6af':
Mitchell Wills [Thu, 27 Aug 2015 19:26:55 +0000 (19:26 +0000)]
am
500dd6c3: am
bb4fd900: (-s ours) am
385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev
* commit '
500dd6c31ea0eeeb198016c6493ba1f6a9d73bcf':
Roshan Pius [Thu, 27 Aug 2015 19:26:40 +0000 (19:26 +0000)]
am
08e05b35: am
49193063: (-s ours) am
78b8d4aa: Mark missed calls as read in calllog restore(2/2)
* commit '
08e05b351ee6625f1ff4fc4e045f7ce61107258f':
John Reck [Thu, 27 Aug 2015 19:26:20 +0000 (19:26 +0000)]
am
f7be4726: am
17dafd60: (-s ours) am
906c8dea: am
bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"
* commit '
f7be4726083f7df4ba1acdd65fbc0e0b89d635ad':
Jean-Michel Trivi [Thu, 27 Aug 2015 19:26:09 +0000 (19:26 +0000)]
am
ad895fe9: am
b98166c6: (-s ours) am
fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev
* commit '
ad895fe9c8649601aeabbb4f05ef5f6a8805cc4a':
John Reck [Thu, 27 Aug 2015 19:25:59 +0000 (19:25 +0000)]
am
09bdc9af: am
666f3194: (-s ours) am
2fa3eec0: am
93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"
* commit '
09bdc9af6f5f300ac2b0377bb8af0b90f811a345':
Svetoslav Ganov [Thu, 27 Aug 2015 19:25:49 +0000 (19:25 +0000)]
am
d55d046d: am
b1ed7e19: (-s ours) am
ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev
* commit '
d55d046df7f900541077a73e803e581c88c97aef':
Yohei Yukawa [Thu, 27 Aug 2015 19:25:38 +0000 (19:25 +0000)]
am
babe9bd0: am
1fdac7a8: (-s ours) am
2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev
* commit '
babe9bd0ecfe198c1df4ff054352215674a423c4':
Nick Kralevich [Thu, 27 Aug 2015 19:25:28 +0000 (19:25 +0000)]
am
09097c1f: am
5fa85ce6: (-s ours) am
97b68bbe: Merge "UsbDeviceManager: fix b/
21429947 regression (try #2)" into mnc-dev
* commit '
09097c1fbca902d72d0b52da7c494c07d38e7515':
John Reck [Thu, 27 Aug 2015 19:25:18 +0000 (19:25 +0000)]
am
00d032aa: am
5fe0aac6: (-s ours) am
70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev
* commit '
00d032aa9745b9f52282b6dfdf3555ba8887dbf0':
Julia Reynolds [Thu, 27 Aug 2015 19:25:06 +0000 (19:25 +0000)]
am
01bd318f: am
c530e778: (-s ours) am
35a1a209: Merge "Include dnd status in bugreports." into mnc-dev
* commit '
01bd318f53d252950438d25bafa5588b29babeb8':
Matthew Williams [Thu, 27 Aug 2015 19:24:44 +0000 (19:24 +0000)]
am
32f1326a: am
0a4af7ad: (-s ours) am
d6ef2313: am
0c53f72e: Merge "Fix NPE in JobStore when jobs.xml is empty."
* commit '
32f1326ad7993e122ce27c974a5e5587700ce07f':
Matthew Williams [Thu, 27 Aug 2015 19:24:23 +0000 (19:24 +0000)]
am
338e3726: am
7d4c58f7: (-s ours) am
fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev
* commit '
338e3726cb63eb88eae88632238759dfcd33498b':
Ian Pedowitz [Thu, 27 Aug 2015 19:24:02 +0000 (19:24 +0000)]
am
1a33f55c: am
93919ff1: (-s ours) am
845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"
* commit '
1a33f55c4241e753265073b370977fd24f7366d6':
Wale Ogunwale [Thu, 27 Aug 2015 19:23:46 +0000 (19:23 +0000)]
am
7fc941e4: am
9fdff2e5: (-s ours) am
b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev
* commit '
7fc941e4140027b095fdde3c1d8c8efd3e513c01':
Jason Monk [Thu, 27 Aug 2015 19:23:31 +0000 (19:23 +0000)]
am
295d442a: am
26085a0a: (-s ours) am
55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev
* commit '
295d442a5225267b934e0fba3770323b0988fd23':
Pavlin Radoslavov [Thu, 27 Aug 2015 19:23:22 +0000 (19:23 +0000)]
am
4e7d0f2d: am
040e5771: (-s ours) am
29b8c4ab: Reset the pointer to the Bluetooth GATT service
* commit '
4e7d0f2dfe026b598b421416e919066ae603a647':
Adam Lesinski [Thu, 27 Aug 2015 19:23:14 +0000 (19:23 +0000)]
am
58ab11e5: am
e8585a23: (-s ours) am
59d72c86: Merge "BatteryStats: Add debug logging to find source of b/
22716723" into mnc-dev
* commit '
58ab11e55dd76e7f947e0bbe669214f8bc3aa1df':
Dianne Hackborn [Thu, 27 Aug 2015 19:23:06 +0000 (19:23 +0000)]
am
004a0943: am
6835ef09: (-s ours) am
d9b0f843: Merge "Fix issue #
22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit '
004a0943c1707eab4196453f58fb8a70a2b390c7':
Prem Kumar [Thu, 27 Aug 2015 19:22:59 +0000 (19:22 +0000)]
am
78bd8a71: am
7fdd006d: (-s ours) am
04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev
* commit '
78bd8a711999c542354f9b2a98cf6670acd5446f':
Wale Ogunwale [Thu, 27 Aug 2015 19:22:50 +0000 (19:22 +0000)]
am
e0564e1d: am
97eb60a6: (-s ours) am
911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev
* commit '
e0564e1dce80c66d5d310a4f0c884348a55656e9':
John Reck [Thu, 27 Aug 2015 19:22:42 +0000 (19:22 +0000)]
am
2a435876: am
5d0c84bd: (-s ours) am
c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev
* commit '
2a435876e793cf85b5f65521170f76345e84bbe7':
Svetoslav Ganov [Thu, 27 Aug 2015 19:22:35 +0000 (19:22 +0000)]
am
76c02707: am
b2972dbd: (-s ours) am
ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev
* commit '
76c02707252f53878a89dfa6bbba736ecf64e9e3':
Dianne Hackborn [Thu, 27 Aug 2015 19:22:27 +0000 (19:22 +0000)]
am
d45d8cb6: am
a7b80741: (-s ours) am
3011f645: Merge "Fix issue #
22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev
* commit '
d45d8cb6e7204d0e0775fa54f0efaf5c1a33bbde':
John Reck [Thu, 27 Aug 2015 19:22:15 +0000 (19:22 +0000)]
am
57d10247: am
10fdfb18: (-s ours) am
7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
* commit '
57d102478039a1330a67c6d3d04f16e7e1ba1377':
Jeff Sharkey [Thu, 27 Aug 2015 19:22:03 +0000 (19:22 +0000)]
am
f2972a77: am
275d41d0: (-s ours) am
0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev
* commit '
f2972a77ea6cdfe6d80dd73535bb116e0479f752':
Matthew Williams [Thu, 27 Aug 2015 19:21:47 +0000 (19:21 +0000)]
am
61dbcca8: am
d13667e3: (-s ours) am
b3448bf1: am
608ad140: Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"
* commit '
61dbcca84314e790801b4575818a6bdf5469128c':
Diego Perez [Thu, 27 Aug 2015 19:21:31 +0000 (19:21 +0000)]
am
5ee7a365: am
16a1c9e1: (-s ours) am
405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit '
5ee7a3659edf1bd04cd1eaeef01b74c9f98c28fb':
Deepanshu Gupta [Thu, 27 Aug 2015 19:21:17 +0000 (19:21 +0000)]
am
f77a645c: am
fecb60f1: (-s ours) am
d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev
* commit '
f77a645cce74f97627d4afd7575f7f96829bbeea':
Jeff Sharkey [Thu, 27 Aug 2015 19:21:05 +0000 (19:21 +0000)]
am
a9525da9: am
e2faac0a: (-s ours) am
3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev
* commit '
a9525da9c1c5f05297e3adb497bf9a11f2d2ca77':
Wale Ogunwale [Thu, 27 Aug 2015 19:20:55 +0000 (19:20 +0000)]
am
cb6c1663: am
2031adff: (-s ours) am
f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev
* commit '
cb6c1663276621f3858881e51a83fd8e6bcb754e':
Alan Viverette [Thu, 27 Aug 2015 19:20:45 +0000 (19:20 +0000)]
am
c7ee9122: am
183aa948: (-s ours) am
7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev
* commit '
c7ee9122f03327dac0fb151f04a61def058238a7':