OSDN Git Service
Dan Sandler [Thu, 27 Aug 2015 08:13:23 +0000 (08:13 +0000)]
am
45b28129: (-s ours) am
86647987: Icon-related Notifications API changes:
* commit '
45b281298d3f97f22aebb19392d107eb34054dab':
Adrian Roos [Thu, 27 Aug 2015 08:13:06 +0000 (08:13 +0000)]
am
86c421b4: (-s ours) am
5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev
* commit '
86c421b4185f845654ae1b0f918d1d32f1fca07c':
Adam Powell [Thu, 27 Aug 2015 08:12:51 +0000 (08:12 +0000)]
am
0cad2b60: (-s ours) am
9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev
* commit '
0cad2b6006e12b2307b6ae86a37abebadff4793c':
Svet Ganov [Thu, 27 Aug 2015 08:12:39 +0000 (08:12 +0000)]
am
2264842f: (-s ours) am
6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev
* commit '
2264842f7169194bbb276004b2e0a589910617ab':
Roshan Pius [Thu, 27 Aug 2015 08:12:27 +0000 (08:12 +0000)]
am
d352bb55: (-s ours) am
5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev
* commit '
d352bb5545d4e2f29f8f9753729f6f3531b50d5c':
Alex Klyubin [Thu, 27 Aug 2015 08:12:19 +0000 (08:12 +0000)]
am
3ddc42fe: (-s ours) am
f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev
* commit '
3ddc42fec60a16281ecc1e4f0c9a7a5df8faf606':
Svet Ganov [Thu, 27 Aug 2015 08:12:08 +0000 (08:12 +0000)]
am
f10d7708: (-s ours) am
d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev
* commit '
f10d7708cab7782fe884359512577bdc938b687d':
Chris Craik [Thu, 27 Aug 2015 08:11:56 +0000 (08:11 +0000)]
am
cb778a8e: (-s ours) am
0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev
* commit '
cb778a8e581cee403bc1596b6857d7a512531a11':
Dianne Hackborn [Thu, 27 Aug 2015 08:11:27 +0000 (08:11 +0000)]
am
628d4653: (-s ours) am
aaee5b53: Merge "Work on issue #
22516282: ChooserTarget URI grants not forwarded" into mnc-dev
* commit '
628d4653d4a1c7264e5caa9c1304463da17b53c0':
Makoto Onuki [Thu, 27 Aug 2015 08:10:43 +0000 (08:10 +0000)]
am
890e3064: (-s ours) am
b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev
* commit '
890e3064e7cce9cd7bbc010846ebc16795feee3e':
Svet Ganov [Thu, 27 Aug 2015 08:09:52 +0000 (08:09 +0000)]
am
f1be0792: (-s ours) am
db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit '
f1be07928e4e2cda2e0fcc3f13091c679f9b0ee2':
Robert Schaub [Thu, 27 Aug 2015 08:09:11 +0000 (08:09 +0000)]
am
d8a869cb: (-s ours) am
081649c2: am
f4db2de8: am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
d8a869cb5b7054a6e0b493323f9ec1c74f8b5b62':
Dianne Hackborn [Thu, 27 Aug 2015 08:08:39 +0000 (08:08 +0000)]
am
cf5375d8: (-s ours) am
8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev
* commit '
cf5375d8a95323ac4bfddc88f4b5729f1fd90ef1':
Miao Wang [Thu, 27 Aug 2015 08:08:09 +0000 (08:08 +0000)]
Todd Kennedy [Thu, 27 Aug 2015 08:07:34 +0000 (08:07 +0000)]
am
ff4b10d3: (-s ours) am
a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
* commit '
ff4b10d3cb6f9af6696b7936cf792336276a47fb':
Wale Ogunwale [Thu, 27 Aug 2015 08:06:52 +0000 (08:06 +0000)]
am
fde33da1: (-s ours) am
11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
* commit '
fde33da13e092a2d6c1d12ee6709099eb36afae1':
John Reck [Thu, 27 Aug 2015 08:06:09 +0000 (08:06 +0000)]
am
7e560444: (-s ours) am
ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev
* commit '
7e560444e755449fc12305fccc99e55da2a4afd2':
Tony Mak [Thu, 27 Aug 2015 08:05:35 +0000 (08:05 +0000)]
am
e90017d9: (-s ours) am
532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
* commit '
e90017d990b72d4b6dbb68322e466e491fe65254':
George Mount [Thu, 27 Aug 2015 08:04:48 +0000 (08:04 +0000)]
am
5fb324ad: (-s ours) am
bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
* commit '
5fb324adfefa288255a85c0f8b0531d573235407':
George Mount [Thu, 27 Aug 2015 08:04:09 +0000 (08:04 +0000)]
am
7f35b0d2: (-s ours) am
30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
7f35b0d2cc606fb25dcbb295c6b7468ac76322f3':
Nicolas Prevot [Thu, 27 Aug 2015 08:03:34 +0000 (08:03 +0000)]
am
0f2b3abf: (-s ours) am
dbdf7c45: Don\'t send app links to the parent if status = never (part 2)
* commit '
0f2b3abf61a46396de6170ab4df5f75700afce0c':
Neil Fuller [Thu, 27 Aug 2015 08:03:00 +0000 (08:03 +0000)]
am
2b5dfb97: (-s ours) am
98f3d953: am
eccbc7c9: Merge "Fix NativeCrashListener"
* commit '
2b5dfb97cabb05b30b17c64ea6b55d8b768029ae':
Narayan Kamath [Thu, 27 Aug 2015 08:02:33 +0000 (08:02 +0000)]
am
95b869e2: (-s ours) am
737106a6: am
1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"
* commit '
95b869e282a69cdfa0a4699490ae21da88cc223d':
Vineeta Srivastava [Thu, 27 Aug 2015 08:02:15 +0000 (08:02 +0000)]
am
d56efb48: (-s ours) am
47e04090: Merge "Remove redundant cancel events from FingerprintService" into mnc-dev
* commit '
d56efb48704f088be5b47465b33da95a15601c13':
Sanket Padawe [Thu, 27 Aug 2015 08:01:54 +0000 (08:01 +0000)]
am
152c2e9a: (-s ours) am
ea975b12: Merge "Add new API for handling DB query per subId." into mnc-dev
* commit '
152c2e9af0dd72ed8d78df83de1cba0777ac222b':
Yohei Yukawa [Thu, 27 Aug 2015 08:01:38 +0000 (08:01 +0000)]
am
979939ef: (-s ours) am
c0aa9744: Merge "PopupWindow position must be specified in window coordinates." into mnc-dev
* commit '
979939ef76c0a64c1929d4d7ac107401881f1e2d':
Yohei Yukawa [Thu, 27 Aug 2015 08:01:15 +0000 (08:01 +0000)]
am
a0d9be5a: (-s ours) am
ebbe7706: Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev
* commit '
a0d9be5a60ec7180de6e566b8d2441b7f66d5c18':
Chris Tate [Thu, 27 Aug 2015 08:00:47 +0000 (08:00 +0000)]
am
3ad2f45b: (-s ours) am
a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev
* commit '
3ad2f45be54fead5b990e29fc1fd8fcce00caf5b':
Chris Tate [Thu, 27 Aug 2015 08:00:13 +0000 (08:00 +0000)]
am
6a10b84b: (-s ours) am
a8455147: (-s ours) am
2fccb66d: Merge "Fix a bug disappearing installerPackageName info of packages after reboot."
* commit '
6a10b84b4ce64df853bd0d64842de85c5ab2e52d':
Deepanshu Gupta [Thu, 27 Aug 2015 07:59:53 +0000 (07:59 +0000)]
am
03727c2f: (-s ours) am
a6ad75fb: Merge "Add tools:openDrawer to open a DrawerLayout." into mnc-dev
* commit '
03727c2f1ac2d09f7872c197568f518467330fbe':
Deepanshu Gupta [Thu, 27 Aug 2015 07:59:37 +0000 (07:59 +0000)]
am
adb63087: (-s ours) am
43286266: Merge "Change tools:list_item to listitem." into mnc-dev
* commit '
adb63087b50ab608041a3a12a162b680e8626b74':
Robert Schaub [Thu, 27 Aug 2015 07:59:23 +0000 (07:59 +0000)]
am
ad4f73ef: (-s ours) am
a73face3: am
8c5f34de: am
b53568f2: docs: Added word "video" to tv app quality guidelines.
* commit '
ad4f73efb4e5b8e2c62b779d700e8fb679bde2d0':
Jun Mukai [Thu, 27 Aug 2015 07:59:08 +0000 (07:59 +0000)]
am
bce08880: (-s ours) am
8703e50d: Merge "Allow selecting quick setting items by keyboard." into mnc-dev
* commit '
bce0888037784fa229cec7d98eb9e2e8356dc37d':
Oren Blasberg [Thu, 27 Aug 2015 07:58:51 +0000 (07:58 +0000)]
am
3812cfb8: (-s ours) am
84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev
* commit '
3812cfb87fc6ce510595c19b265cc9e23fd041cf':
Adrian Roos [Thu, 27 Aug 2015 07:58:31 +0000 (07:58 +0000)]
am
d83f4acc: (-s ours) am
fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev
* commit '
d83f4acc5f5d1c318615273f26458aea0662cdb8':
Christopher Tate [Thu, 27 Aug 2015 07:58:13 +0000 (07:58 +0000)]
am
c01d80c3: (-s ours) am
3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev
* commit '
c01d80c3088f5f6356b9d948e45500250993cb16':
Billy Lau [Thu, 27 Aug 2015 07:57:57 +0000 (07:57 +0000)]
am
1db9717a: (-s ours) am
008409a2: Merge "Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit '
1db9717a3b1b1b37a362b421f0320ebdbee8996b':
Dianne Hackborn [Thu, 27 Aug 2015 07:57:39 +0000 (07:57 +0000)]
am
e13f9e41: (-s ours) am
f6586cbd: Merge "Implement issue #
22403908: Enable assistant to refuse context sharing" into mnc-dev
* commit '
e13f9e41fe4d43409696f32113894fe44e4964ee':
Dianne Hackborn [Thu, 27 Aug 2015 07:57:23 +0000 (07:57 +0000)]
am
b742acaa: (-s ours) am
67e02e60: Merge "Fix issue #
22487155: Device unresponsive (deadlock in system_server)" into mnc-dev
* commit '
b742acaaa0a36fafb242023947964ab7aff216ef':
Dianne Hackborn [Thu, 27 Aug 2015 07:57:14 +0000 (07:57 +0000)]
am
cc8555bf: (-s ours) am
c4e2bcd4: Merge "Fix issue #
22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev
* commit '
cc8555bf2cf9c1b884cda27dbcc1297d0626c2b4':
Dianne Hackborn [Thu, 27 Aug 2015 07:57:05 +0000 (07:57 +0000)]
am
10442514: (-s ours) am
c1a49b50: Merge "Fix issue #
22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev
* commit '
1044251417972d854933d378beecc6a2848356e7':
Dianne Hackborn [Thu, 27 Aug 2015 07:56:56 +0000 (07:56 +0000)]
am
190b8470: (-s ours) am
1cf8b0b6: Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
* commit '
190b8470fc7ecc9dfcc8a45c5a9fdc467206402a':
Svetoslav [Thu, 27 Aug 2015 07:56:49 +0000 (07:56 +0000)]
am
4b27514e: (-s ours) am
08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev
* commit '
4b27514e0479e34f9bc00020083c7f03614a51c1':
Christopher Tate [Thu, 27 Aug 2015 07:56:40 +0000 (07:56 +0000)]
am
df263ee8: (-s ours) am
06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
* commit '
df263ee885cf667539f497da957f558268298b29':
Abodunrinwa Toki [Thu, 27 Aug 2015 07:56:32 +0000 (07:56 +0000)]
am
5db78381: (-s ours) am
6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
* commit '
5db783810e113c68de896b5c925a16258b6a5e9a':
Miao Wang [Thu, 27 Aug 2015 07:56:18 +0000 (07:56 +0000)]
am
9ee3b6f1: (-s ours) am
ad904cf3: Merge "fix BNNM docs" into mnc-dev
* commit '
9ee3b6f1368420b4bb3381fc7d823c5db947dddf':
Svet Ganov [Thu, 27 Aug 2015 07:55:58 +0000 (07:55 +0000)]
am
7a14c11d: (-s ours) am
75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
* commit '
7a14c11d431f2c74c8f6c74825b30d32a8341b55':
Geoff Mendal [Thu, 27 Aug 2015 07:55:21 +0000 (07:55 +0000)]
am
40c0d8c8: (-s ours) am
78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
40c0d8c8ac2d0f8778c6a94a860ff655cadedfb7':
Adrian Roos [Thu, 27 Aug 2015 07:54:57 +0000 (07:54 +0000)]
am
5cdeb956: (-s ours) am
3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev
* commit '
5cdeb956fdd62718f3957514f573dcb6ff3a24e3':
Geoff Mendal [Thu, 27 Aug 2015 07:54:41 +0000 (07:54 +0000)]
am
a437a516: (-s ours) am
4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
a437a51640b87f690d59d15b6b6020c718420f9b':
Geoff Mendal [Thu, 27 Aug 2015 07:54:32 +0000 (07:54 +0000)]
am
fd184821: (-s ours) am
197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
fd18482111205f90118e8727021abee4f8c9c2cb':
Geoff Mendal [Thu, 27 Aug 2015 07:54:25 +0000 (07:54 +0000)]
am
bf833850: (-s ours) am
6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
bf833850bf4adfd7413820919d7cccfdf9eba03a':
Geoff Mendal [Thu, 27 Aug 2015 07:54:16 +0000 (07:54 +0000)]
am
3d345916: (-s ours) am
a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
3d34591625c3d0a7cb7a9888d2358b405d015b7f':
Geoff Mendal [Thu, 27 Aug 2015 07:54:07 +0000 (07:54 +0000)]
am
913f9a31: (-s ours) am
ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
913f9a31b290decae328cdb53fda4b55acac2e64':
Geoff Mendal [Thu, 27 Aug 2015 07:53:48 +0000 (07:53 +0000)]
am
7550c53d: (-s ours) am
36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
7550c53de9c50ab593d6dd45b55d0db594e3cfbb':
Geoff Mendal [Thu, 27 Aug 2015 07:53:12 +0000 (07:53 +0000)]
am
f28f62fe: (-s ours) am
e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f28f62fe5ced747293118c75d7934dca2932d6e3':
Jorim Jaggi [Thu, 27 Aug 2015 07:52:19 +0000 (07:52 +0000)]
am
897d0ff2: (-s ours) am
eea8be53: Adjust assist disclosure stroke width to spec
* commit '
897d0ff2c49041403d2e93a838cbeac7379c9c58':
Roshan Pius [Thu, 27 Aug 2015 07:51:28 +0000 (07:51 +0000)]
am
9a077502: (-s ours) am
4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev
* commit '
9a07750294beb2b5c301db2e87a3969fa40f2ff7':
Felipe Leme [Thu, 27 Aug 2015 07:50:46 +0000 (07:50 +0000)]
am
69a5b4f4: (-s ours) am
68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev
* commit '
69a5b4f4e8c2613a4e1a998581be4149e8ef4abf':
Dianne Hackborn [Thu, 27 Aug 2015 07:50:14 +0000 (07:50 +0000)]
am
a9f27f03: (-s ours) am
d193916c: Merge "Fix build." into mnc-dev
* commit '
a9f27f038a934eb1b9ce75ad5563f9d4a6f82e95':
Jeff Brown [Thu, 27 Aug 2015 07:49:44 +0000 (07:49 +0000)]
Jeff Brown [Thu, 27 Aug 2015 07:49:05 +0000 (07:49 +0000)]
am
0c779818: (-s ours) am
2dbccc19: Clean up USB Manager dump.
* commit '
0c779818656aa31c26bed1948d291492d6509705':
Jeff Sharkey [Thu, 27 Aug 2015 07:48:22 +0000 (07:48 +0000)]
am
ddde2ac3: (-s ours) am
539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev
* commit '
ddde2ac3102761f16a89c69cebb1afb55319b4de':
Jeff Sharkey [Thu, 27 Aug 2015 07:47:41 +0000 (07:47 +0000)]
am
02e19d08: (-s ours) am
483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev
* commit '
02e19d08ef6efa00efa6ec2f2f517bd6c89da712':
Dianne Hackborn [Thu, 27 Aug 2015 07:46:53 +0000 (07:46 +0000)]
am
e6325869: (-s ours) am
1d4247c4: Merge "Improve tracking of screen on reasons." into mnc-dev
* commit '
e632586957314729f87ed9019855da39c741ec0b':
Geoff Mendal [Thu, 27 Aug 2015 07:46:08 +0000 (07:46 +0000)]
am
5cb32edb: (-s ours) am
facfbc52: (-s ours) Import translations. DO NOT MERGE
* commit '
5cb32edb0dcb5c186fa6d2ea7aab94fda4d96e4a':
Geoff Mendal [Thu, 27 Aug 2015 07:45:33 +0000 (07:45 +0000)]
am
0c1ee954: (-s ours) am
b4ac0141: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
0c1ee9540cbb62dfc99dcf2eacb08909835ada44':
George Mount [Thu, 27 Aug 2015 07:45:03 +0000 (07:45 +0000)]
am
1a9e0c95: (-s ours) am
503ad9ee: Merge "Fix input pause without resume." into mnc-dev
* commit '
1a9e0c950eac973eba5416ff0632dec558f35f7f':
Geoff Mendal [Thu, 27 Aug 2015 07:44:34 +0000 (07:44 +0000)]
am
d0af481e: (-s ours) am
94666b76: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
d0af481ef432ec862e5f64fb2a7846da7a7b5e22':
Geoff Mendal [Thu, 27 Aug 2015 07:44:15 +0000 (07:44 +0000)]
am
30e1781a: (-s ours) am
57d8be8b: (-s ours) Import translations. DO NOT MERGE
* commit '
30e1781aba5c9541dbb60befa6021c29a2868e70':
Adam Powell [Thu, 27 Aug 2015 07:43:57 +0000 (07:43 +0000)]
am
12afd29b: (-s ours) am
18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev
* commit '
12afd29b1ec3cac1bb2a45536a3e47fd29b86df7':
Dianne Hackborn [Thu, 27 Aug 2015 07:43:42 +0000 (07:43 +0000)]
am
9a24cd71: (-s ours) am
63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev
* commit '
9a24cd715f48993ac97d867fbd88f8ac9bbb6c3f':
Dianne Hackborn [Thu, 27 Aug 2015 07:43:23 +0000 (07:43 +0000)]
am
63cb6c42: (-s ours) am
f1f8b9cc: Merge "Fix issue #
21626564: MMS should be receivied while Dozing" into mnc-dev
* commit '
63cb6c4216bb92e398915c42fda348eb44d0961b':
Fyodor Kupolov [Thu, 27 Aug 2015 07:42:58 +0000 (07:42 +0000)]
am
45296bab: (-s ours) am
4044440d: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev
* commit '
45296babe262e58d1f7a4cb0d6344ac213f870da':
Eric Laurent [Thu, 27 Aug 2015 07:42:19 +0000 (07:42 +0000)]
am
336fde34: (-s ours) am
bd874b8b: Merge "AudioManager: fix audio device callback list access" into mnc-dev
* commit '
336fde349e90f9f91eeeebd9a7d223e292ccfa91':
Fyodor Kupolov [Thu, 27 Aug 2015 07:41:59 +0000 (07:41 +0000)]
am
29e8318c: (-s ours) am
98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev
* commit '
29e8318cb4cca3da84bc3228962e4cc485af7c5e':
Adam Lesinski [Thu, 27 Aug 2015 07:41:44 +0000 (07:41 +0000)]
am
9fcdb936: (-s ours) am
267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev
* commit '
9fcdb936865dda509572cb36404719a4befe118a':
Adam Lesinski [Thu, 27 Aug 2015 07:41:29 +0000 (07:41 +0000)]
am
72984da9: (-s ours) am
56d82dd2: BatteryStats: Fix deadlock
* commit '
72984da9ad99edb555484ba19374129c3eaaf8c5':
Adam Lesinski [Thu, 27 Aug 2015 07:41:14 +0000 (07:41 +0000)]
am
5e9e64c0: (-s ours) am
d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev
* commit '
5e9e64c000b55848ea5d2f812d63fc9bd5d4b41d':
Yin-Chia Yeh [Thu, 27 Aug 2015 07:40:59 +0000 (07:40 +0000)]
am
d823b013: (-s ours) am
b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
* commit '
d823b013a86c3f2e64dd2e035ef095ccb1058c76':
Fyodor Kupolov [Thu, 27 Aug 2015 07:40:33 +0000 (07:40 +0000)]
am
17e97b00: (-s ours) am
4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev
* commit '
17e97b002af04f62715001535e7933dc24d47f09':
Narayan Kamath [Thu, 27 Aug 2015 07:40:14 +0000 (07:40 +0000)]
am
74b04315: (-s ours) am
b9f170ff: am
b4db7923: Merge "Delete some obsolete test code."
* commit '
74b04315c400968ffec6d9b885d396cc864a58a0':
Mathieu Chartier [Thu, 27 Aug 2015 07:39:53 +0000 (07:39 +0000)]
am
30e8a36d: (-s ours) am
ad4a285a: am
ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"
* commit '
30e8a36de13901c0a9b4c8bebfce36f762458129':
xinhe [Thu, 27 Aug 2015 07:39:35 +0000 (07:39 +0000)]
am
27ad72ef: (-s ours) am
f1c2a1f7: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev
* commit '
27ad72efb384489fc9a30a72519b7ff57f8e9ab9':
Yorke Lee [Thu, 27 Aug 2015 07:39:25 +0000 (07:39 +0000)]
am
043cf1af: (-s ours) am
b63b031c: Merge "Standardize stateToString return values" into mnc-dev
* commit '
043cf1af841e362315b7444cc7c1315d21cb7985':
Fyodor Kupolov [Thu, 27 Aug 2015 07:39:16 +0000 (07:39 +0000)]
am
76ff0acd: (-s ours) am
d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev
* commit '
76ff0acdad269d98a70dd08a4d7ff8fd606a8675':
Jeff Sharkey [Thu, 27 Aug 2015 07:39:08 +0000 (07:39 +0000)]
am
e6644996: (-s ours) am
d3719ab0: Merge "Better handling of storage paths." into mnc-dev
* commit '
e6644996596f25c85b17f1debc90bd6c6797f308':
Chien-Yu Chen [Thu, 27 Aug 2015 07:39:00 +0000 (07:39 +0000)]
am
5d12a934: (-s ours) am
6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev
* commit '
5d12a9346fbab02cc96d2c3d2a855bbd35363b98':
Julia Reynolds [Thu, 27 Aug 2015 07:38:52 +0000 (07:38 +0000)]
am
2f2c9524: (-s ours) am
5cf30c60: Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev
* commit '
2f2c9524708b8fc0a5026aee3fb8d91a209ab889':
Andrew Solovay [Thu, 27 Aug 2015 07:38:43 +0000 (07:38 +0000)]
am
dfa2f618: (-s ours) am
353886b2: am
e67416ec: am
4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs
* commit '
dfa2f61849ebbee554942bff766eab3841b7e4db':
Jason Monk [Thu, 27 Aug 2015 07:38:33 +0000 (07:38 +0000)]
am
f3eaef21: (-s ours) am
fb973240: Merge "Fix status bar bt accessibility message" into mnc-dev
* commit '
f3eaef2153559ae83ac0f9256d509241b863e725':
Jason Monk [Thu, 27 Aug 2015 07:38:21 +0000 (07:38 +0000)]
am
59d71f17: (-s ours) am
2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev
* commit '
59d71f17b5bd2b3eaf190b551319295134ff7f01':
Adam Lesinski [Thu, 27 Aug 2015 07:38:04 +0000 (07:38 +0000)]
am
493244d3: (-s ours) am
92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev
* commit '
493244d35cd4215485ccbfe3e862ef9f8a0c8d78':
Svetoslav [Thu, 27 Aug 2015 07:37:42 +0000 (07:37 +0000)]
am
90eb7035: (-s ours) am
8b6d5b6b: Merge "Clear binder id when determining external storage state" into mnc-dev
* commit '
90eb7035f561d790ea401f59d05bdac93e4df325':
Dan Sandler [Thu, 27 Aug 2015 07:37:24 +0000 (07:37 +0000)]
am
e412ced1: (-s ours) am
66cc6bb6: Merge "Allow notification strings to be unredacted in dump output." into mnc-dev
* commit '
e412ced1e2243010a70a15664bf6025a069f2921':
Svetoslav [Thu, 27 Aug 2015 07:37:08 +0000 (07:37 +0000)]
am
8fcd8e8b: (-s ours) am
46d1864c: Merge "Make get_accounts a runtime permissions again" into mnc-dev
* commit '
8fcd8e8b596e24f35b32bdd0edf6782b603e74b7':
Selim Cinek [Thu, 27 Aug 2015 07:36:55 +0000 (07:36 +0000)]
am
1e935acb: (-s ours) am
f5adce87: Merge "Removed logging for the empty keyguard" into mnc-dev
* commit '
1e935acb8fa7820ad0fd6879de6734aaef5d7629':
Amit Mahajan [Thu, 27 Aug 2015 07:36:46 +0000 (07:36 +0000)]
am
ed534e34: (-s ours) am
51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev
* commit '
ed534e34e3bef7ead5164d96e6dabc2e79451c5f':
Jason Monk [Thu, 27 Aug 2015 07:36:38 +0000 (07:36 +0000)]
am
1715b0ca: (-s ours) am
fe03a84b: Merge "Fix QS labels on language change" into mnc-dev
* commit '
1715b0cafd37626a5c7f3aa3357f4d823c3c9356':
Marco Nelissen [Thu, 27 Aug 2015 07:36:20 +0000 (07:36 +0000)]
am
82419868: (-s ours) am
3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev
* commit '
82419868b924eaae21224acae3c267b17f3a59c7':