OSDN Git Service
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':
Craig Lafayette [Thu, 27 Aug 2015 07:35:44 +0000 (07:35 +0000)]
am
3a5d0fa7: (-s ours) am
2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev
* commit '
3a5d0fa71ce36271f289744c6e56267b3215873b':
Chris Craik [Thu, 27 Aug 2015 07:34:47 +0000 (07:34 +0000)]
am
65d8b59b: (-s ours) am
941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev
* commit '
65d8b59b0ff71ec447eb17b693d1057c74e83b93':
Alex Klyubin [Thu, 27 Aug 2015 07:33:55 +0000 (07:33 +0000)]
am
c9125d69: (-s ours) am
10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev
* commit '
c9125d69ed02f5861e88f48bf6ff7b2ab643f9d8':
Yohei Yukawa [Thu, 27 Aug 2015 07:33:19 +0000 (07:33 +0000)]
am
fc5ffc4c: (-s ours) am
12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev
* commit '
fc5ffc4c185a21ae23c1a49e399676b99d65f27b':
Ronghua Wu [Thu, 27 Aug 2015 07:32:58 +0000 (07:32 +0000)]
am
86092631: (-s ours) am
148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev
* commit '
8609263113abd4808d44cb7d5c9c806201a7c0ad':
Andrei Stingaceanu [Thu, 27 Aug 2015 07:32:23 +0000 (07:32 +0000)]
am
085e8728: (-s ours) am
8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev
* commit '
085e8728398f53699c7cde65b46f1005733f3a40':
Julia Reynolds [Thu, 27 Aug 2015 07:31:39 +0000 (07:31 +0000)]
am
5b02dfad: (-s ours) am
f5e20ec3: Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev
* commit '
5b02dfad237bd040d2602b07dd73d751560e4029':
Andrei Stingaceanu [Thu, 27 Aug 2015 07:30:47 +0000 (07:30 +0000)]
am
028492f2: (-s ours) am
a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev
* commit '
028492f20e4b25b5db181761bf00dbaf8c095592':
Erik Kline [Thu, 27 Aug 2015 07:29:55 +0000 (07:29 +0000)]
am
148d07c3: (-s ours) am
77612940: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev
* commit '
148d07c37546c3a4ee625d675cf3a92dca1a94fe':
Zach Johnson [Thu, 27 Aug 2015 07:29:05 +0000 (07:29 +0000)]
am
7f28528e: (-s ours) am
569ff225: Fix BluetoothSocket file descriptor leak
* commit '
7f28528e57bc35ae6659843a1feb9f8e4972c895':
Svet Ganov [Thu, 27 Aug 2015 07:28:26 +0000 (07:28 +0000)]
Svet Ganov [Thu, 27 Aug 2015 07:27:52 +0000 (07:27 +0000)]
am
325d7bae: (-s ours) am
8cee6587: Merge "Teach storage appops." into mnc-dev
* commit '
325d7baef91bd12a9426c647156928e93a062bc4':
Christopher Tate [Thu, 27 Aug 2015 07:27:23 +0000 (07:27 +0000)]
am
f8d2468e: (-s ours) am
4b9b3e47: Merge "Default browser should not supersede intent filter priorities" into mnc-dev
* commit '
f8d2468e6df71023c6c2f9f02af04b6cdd084ed2':
Svet Ganov [Thu, 27 Aug 2015 07:27:03 +0000 (07:27 +0000)]
am
c79e2832: (-s ours) am
fc2bc7f1: Merge "Check signatures of privileged persistent apps for granting defailt permissions" into mnc-dev
* commit '
c79e283220710b5f29d938b2b88a394510855724':
Christopher Tate [Thu, 27 Aug 2015 07:26:44 +0000 (07:26 +0000)]
am
970cdd9b: (-s ours) am
288ecf98: Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev
* commit '
970cdd9ba4f09fddb9eaffd3ce89a105842da701':
Svetoslav [Thu, 27 Aug 2015 07:26:26 +0000 (07:26 +0000)]
am
247c9236: (-s ours) am
56c59d15: Merge "Fix two grant default permissions edge cases." into mnc-dev
* commit '
247c9236b32eda904736e454bc600fd2c8fa021b':
Robert Schaub [Thu, 27 Aug 2015 07:26:09 +0000 (07:26 +0000)]
am
6bf45231: (-s ours) am
9de5dcac: am
70d39c28: am
2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
* commit '
6bf45231dd0dfb09c5d890c026980b41c1dbc462':
Jason Monk [Thu, 27 Aug 2015 07:25:50 +0000 (07:25 +0000)]
am
ab64eff5: (-s ours) am
9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev
* commit '
ab64eff59f0ec705049936574e07385d3835041f':
Robert Schaub [Thu, 27 Aug 2015 07:25:27 +0000 (07:25 +0000)]
am
ed0c4ddc: (-s ours) am
fd186d20: am
28006a3b: am
7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs
* commit '
ed0c4ddcf863cc1307d548e1a2798bfcb00d9d1e':
Robert Schaub [Thu, 27 Aug 2015 07:25:08 +0000 (07:25 +0000)]
am
323dd6c9: (-s ours) am
0b403ebd: am
1962b730: am
3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs
* commit '
323dd6c9b47dd5c8dfaf843b450268dbe2e55ea9':
David Friedman [Thu, 27 Aug 2015 07:24:49 +0000 (07:24 +0000)]
am
69a936e0: (-s ours) am
91a44578: am
5c3bf584: am
e0f0fabb: am
ccb8a9af: am
b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs
* commit '
69a936e0b21fe93b08f699d5a81ac09c4457a02e':
Eric Gilmore [Thu, 27 Aug 2015 07:24:33 +0000 (07:24 +0000)]
am
f376b4cf: (-s ours) am
908c50a1: am
f13e914d: am
8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs
* commit '
f376b4cfff90643a27fb68ca398beabc18d6b85c':
Jinsuk Kim [Thu, 27 Aug 2015 07:24:19 +0000 (07:24 +0000)]
am
23223026: (-s ours) am
e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev
* commit '
23223026d897f17713ceae9a4d39a257219ffb1d':
Roshan Pius [Thu, 27 Aug 2015 07:24:03 +0000 (07:24 +0000)]
am
639ebe0c: (-s ours) am
cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev
* commit '
639ebe0c159bd09dd7e84ba40ccf6f8626632dd5':
Amit Mahajan [Thu, 27 Aug 2015 07:23:41 +0000 (07:23 +0000)]
am
8eeb2e9b: (-s ours) am
53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev
* commit '
8eeb2e9bd90e6f2774bd12424a99ce83e4551fff':
John Reck [Thu, 27 Aug 2015 07:23:08 +0000 (07:23 +0000)]
am
0aaea6d3: (-s ours) am
f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev
* commit '
0aaea6d37060cd04f724a60f7df6af2b5465ba85':
Wale Ogunwale [Thu, 27 Aug 2015 07:22:28 +0000 (07:22 +0000)]
am
afa4766d: (-s ours) am
093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '
afa4766d25ff4495bbcd615a7dcf17787cec5a94':
Vinit Deshpande [Thu, 27 Aug 2015 07:22:10 +0000 (07:22 +0000)]
am
4b0d92ca: (-s ours) am
0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev
* commit '
4b0d92ca3a43ea8a03152e38f2ded713713897e4':
Jim Miller [Thu, 27 Aug 2015 07:22:01 +0000 (07:22 +0000)]
am
23e65930: (-s ours) am
16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev
* commit '
23e65930acc630266378f956d70d3ec6d56e6c26':
Aravind Akella [Thu, 27 Aug 2015 07:21:53 +0000 (07:21 +0000)]
am
4bbc3edd: (-s ours) am
37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev
* commit '
4bbc3edd29e1c7471c0efbc670aa374941f118bd':
Etan Cohen [Thu, 27 Aug 2015 07:21:45 +0000 (07:21 +0000)]
am
66d9e138: (-s ours) am
c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev
* commit '
66d9e138fa19cf57f9a6a7c4e1ff867d0a600f58':
Amith Yamasani [Thu, 27 Aug 2015 07:21:36 +0000 (07:21 +0000)]
am
f6335156: (-s ours) am
1578357d: Merge "Check user state after clearing identity." into mnc-dev
* commit '
f633515699a3f283fea87a39ea7d718d908f8120':
Chris Wren [Thu, 27 Aug 2015 07:21:28 +0000 (07:21 +0000)]
am
70811001: (-s ours) am
208934ff: Merge "fix build by restoring deleted enum" into mnc-dev
* commit '
70811001a372766c7a54d8daec2b428706b4f253':
Julia Reynolds [Thu, 27 Aug 2015 07:21:13 +0000 (07:21 +0000)]
am
11ece5ce: (-s ours) am
fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev
* commit '
11ece5ceec31e052672be46fd7a5433a0ae15158':
Jason Monk [Thu, 27 Aug 2015 07:20:49 +0000 (07:20 +0000)]
am
a8d5740c: (-s ours) am
28a07ff0: Merge "Fix demo mode issues" into mnc-dev
* commit '
a8d5740c83746e3843af0faba755d1ff56b1520a':
Chris Wren [Thu, 27 Aug 2015 07:20:15 +0000 (07:20 +0000)]
am
83e5a72b: (-s ours) am
4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev
* commit '
83e5a72b672d9c9787ec0fcb42335004313e7d36':
Jason Monk [Thu, 27 Aug 2015 07:20:01 +0000 (07:20 +0000)]
am
b1d0e8ac: (-s ours) am
59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev
* commit '
b1d0e8acab59567b2fe409c12b8f0d94ac79f184':
Geoff Mendal [Thu, 27 Aug 2015 07:19:53 +0000 (07:19 +0000)]
am
876e7c17: (-s ours) am
c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
876e7c175bca24954a4ad01fb9816b56d01a37b6':
Neil Fuller [Thu, 27 Aug 2015 07:19:41 +0000 (07:19 +0000)]
am
f6db67c8: (-s ours) am
3ecbca50: am
886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."
* commit '
f6db67c8f3fd0c57944a51289b5ef63c4f746f8a':
Rubin Xu [Thu, 27 Aug 2015 07:19:32 +0000 (07:19 +0000)]
am
87ea7e2f: (-s ours) am
cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev
* commit '
87ea7e2fb6b81a53664a404be52d03025705f7e2':
Esteban Talavera [Thu, 27 Aug 2015 07:19:24 +0000 (07:19 +0000)]
am
82bd3ae0: (-s ours) am
0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev
* commit '
82bd3ae008dd0e1313381deffece01c31ce92110':
Esteban Talavera [Thu, 27 Aug 2015 07:19:12 +0000 (07:19 +0000)]
am
81d511ab: (-s ours) am
22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev
* commit '
81d511abe0bf352e5bcb8fe7f946a70b51000fe5':
Billy Lau [Thu, 27 Aug 2015 07:18:46 +0000 (07:18 +0000)]
am
462ab255: (-s ours) am
96d00ab3: Merge "Bug:
21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev
* commit '
462ab2555e4eb4a8034e166e2c89d06cd1102af4':
Zhijun He [Thu, 27 Aug 2015 07:18:04 +0000 (07:18 +0000)]
am
6fe81428: (-s ours) am
4fb81253: Camera metadata: fix typos.
* commit '
6fe81428df10fe792b792cd56219ca1f9d3be6d7':
Geoff Mendal [Thu, 27 Aug 2015 07:17:12 +0000 (07:17 +0000)]
am
15a7ef90: (-s ours) am
1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
15a7ef90d6110e5891573c86a4c0c7eb17157a02':
Geoff Mendal [Thu, 27 Aug 2015 07:16:22 +0000 (07:16 +0000)]
am
6c9fd7ad: (-s ours) am
d64ba82e: (-s ours) Import translations. DO NOT MERGE
* commit '
6c9fd7ad1276fce19d189519940fc917ae452878':
Raph Levien [Thu, 27 Aug 2015 07:15:39 +0000 (07:15 +0000)]
am
4a4a4505: (-s ours) am
1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev
* commit '
4a4a4505d5287940a5a9dc64711bc6da7596bdba':
Amith Yamasani [Thu, 27 Aug 2015 07:15:04 +0000 (07:15 +0000)]
am
c8e4f119: (-s ours) am
292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev
* commit '
c8e4f119759b59ec17f9a35b95ce9086772f5db6':
Amith Yamasani [Thu, 27 Aug 2015 07:14:11 +0000 (07:14 +0000)]
am
724d13b2: (-s ours) am
5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev
* commit '
724d13b28801a84f6856062c4d97394ef16a0799':
Sanket Padawe [Thu, 27 Aug 2015 07:13:14 +0000 (07:13 +0000)]
am
51705fab: (-s ours) am
233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev
* commit '
51705faba5f5a352000070bd2e2081d37f26b5f7':
OSDN Git Service
