OSDN Git Service
Filip Gruszczynski [Mon, 1 Jun 2015 18:49:47 +0000 (18:49 +0000)]
am
21605b33: am
99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of
47249f2a to mnc-dev""" into mnc-dev
* commit '
21605b3395372b1ee1dd645bb8d9e50c7e7e9460':
Revert "Revert "resolved conflicts for merge of
47249f2a to mnc-dev""
Geoff Mendal [Mon, 1 Jun 2015 18:14:23 +0000 (18:14 +0000)]
am
07ec79d2: (-s ours) am
c4e5ec3f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
07ec79d269bf565becb2eb096dc28c1bb953a4be':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 18:14:18 +0000 (18:14 +0000)]
am
32b0118a: (-s ours) am
e4a9ecb2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
32b0118ab1dd92fb02bb20e12d6c7f9f97cabf88':
Import translations. DO NOT MERGE
John Spurlock [Mon, 1 Jun 2015 18:14:10 +0000 (18:14 +0000)]
am
2b5002e6: am
a58b9a2c: Merge "Battery saver: limit notification intents to system UI." into mnc-dev
* commit '
2b5002e6317ba2a7417622800886e877df33818f':
Battery saver: limit notification intents to system UI.
Selim Cinek [Mon, 1 Jun 2015 18:14:05 +0000 (18:14 +0000)]
am
5e5a408c: am
4bd071e5: Merge "Shortened the duration of HUNs" into mnc-dev
* commit '
5e5a408c4c696ade7e97fc290830fc078653ceee':
Shortened the duration of HUNs
Neil Fuller [Mon, 1 Jun 2015 18:13:39 +0000 (18:13 +0000)]
am
91ef6a2e: am
3b7f9615: Merge "Fix javadocs based on recent case consistency change" into mnc-dev
* commit '
91ef6a2e9d813900c5f417caff3f32fc9780b911':
Fix javadocs based on recent case consistency change
Erik Kline [Mon, 1 Jun 2015 17:11:37 +0000 (17:11 +0000)]
am
8ef5ac13: am
ab069235: Treat RTM_DELNEIGH as a transition to NUD_NONE
* commit '
8ef5ac13abf3602c195ea972a9c5ce5626d1a6dd':
Treat RTM_DELNEIGH as a transition to NUD_NONE
Geoff Mendal [Mon, 1 Jun 2015 17:11:24 +0000 (17:11 +0000)]
am
e438183d: (-s ours) am
29932d13: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e438183d84839f5d02962770bf456f846f9645ef':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:11:18 +0000 (17:11 +0000)]
am
f8db2d7c: (-s ours) am
d048f87a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f8db2d7cd09adf8ad4cd1e205c0bdfb90e8af76f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:11:12 +0000 (17:11 +0000)]
am
392acb98: (-s ours) am
7c2bd4c2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
392acb98acf86cbcca2e50c545d6d77f821ec1f8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:11:07 +0000 (17:11 +0000)]
am
52ebe172: (-s ours) am
edd7ca48: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
52ebe172a7ab26fa9513393c277ea19c8c43fa3c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:11:01 +0000 (17:11 +0000)]
am
2865ce0e: (-s ours) am
09495631: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
2865ce0e85c4b9b969de9d08a22710ddd4eb5373':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:10:54 +0000 (17:10 +0000)]
am
2ccc33c5: (-s ours) am
5da10d94: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
2ccc33c5449a05892a41e0f6a12cbf43fba2f463':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:10:49 +0000 (17:10 +0000)]
am
780ec6a2: (-s ours) am
ec83bc71: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
780ec6a29aecd1fa71276de4bda8deb6f49bc7e3':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:10:42 +0000 (17:10 +0000)]
am
b1dfd97f: (-s ours) am
3b88e96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
b1dfd97f476d07bbf1381983399e7b21e930c870':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:10:35 +0000 (17:10 +0000)]
am
e3a25165: (-s ours) am
9e63f233: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e3a25165a4dae32a4081d7fa886607269719cfb4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:10:13 +0000 (17:10 +0000)]
am
a6eda952: (-s ours) am
a35e790d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
a6eda952908cc9d01935937ebbcd3dd4460c48dc':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 17:10:07 +0000 (17:10 +0000)]
am
62d28b7a: (-s ours) am
998b1c45: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
62d28b7aaf1b357be31df6a03e55b9d836be9a80':
Import translations. DO NOT MERGE
Barnaby James [Mon, 1 Jun 2015 17:09:02 +0000 (17:09 +0000)]
am
4ead90a1: am
6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into mnc-dev
* commit '
4ead90a1c200f144e91d176b4c1627b1bad37f45':
Minor VoiceInteractor documentation fixes.
Jeff Sharkey [Mon, 1 Jun 2015 17:08:43 +0000 (17:08 +0000)]
am
1bf1af04: am
d659f450: Fix the build months later?
* commit '
1bf1af0492459ff77cd6b901329eb13f3507bb1e':
Fix the build months later?
Joe Fernandez [Mon, 1 Jun 2015 17:08:33 +0000 (17:08 +0000)]
am
7045b392: am
3bacb4d8: am
0e997308: am
e2ee9b6b: docs: M Preview - Update volantis download signatures
* commit '
7045b392780d12ff051e53a98cbf76b35b24df39':
docs: M Preview - Update volantis download signatures
Alan Viverette [Mon, 1 Jun 2015 17:08:23 +0000 (17:08 +0000)]
am
143c97b2: am
2b184e86: Merge "Reduce amount of unnecessary RippleDrawable mask redraw" into mnc-dev
* commit '
143c97b2f07b6176b1a2ec624b76ce133b2c0c28':
Reduce amount of unnecessary RippleDrawable mask redraw
Andrew Solovay [Mon, 1 Jun 2015 17:08:16 +0000 (17:08 +0000)]
am
3d4db82c: am
765389ec: am
c5abcba4: am
820f2501: Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs
* commit '
3d4db82c563c4c1f90ff18ec5cdd37b17feec8dd':
docs: Quick fixes for the M Preview "Setup SDK" page.
David Friedman [Mon, 1 Jun 2015 17:08:10 +0000 (17:08 +0000)]
am
b5b6633a: am
538aabc1: am
270d4a70: am
acb470be: am
490f8761: am
7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit '
b5b6633ad97dc9f0bddc0b0442b084965ddc882b':
Quick typo fix.
Deepanshu Gupta [Mon, 1 Jun 2015 17:08:02 +0000 (17:08 +0000)]
am
829159f1: am
996458b7: Fix ParserFactory not initialized error.
* commit '
829159f109f6f3ce38205f10d707c5565a32e889':
Fix ParserFactory not initialized error.
Joe Fernandez [Mon, 1 Jun 2015 17:07:56 +0000 (17:07 +0000)]
am
159f6ccd: am
e14e97a3: am
4a97fb5d: am
6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs
* commit '
159f6ccda1ffbfc6cb55abc6f09bf96aa9dd1cbf':
docs: supportlib 22.2.0 design version update
Yohei Yukawa [Mon, 1 Jun 2015 17:07:48 +0000 (17:07 +0000)]
am
d9597642: am
512234f1: Merge "Close input session when the view is detached from the window." into mnc-dev
* commit '
d9597642ebbe4601568ad73ff20281c237e606fa':
Close input session when the view is detached from the window.
Christopher Tate [Mon, 1 Jun 2015 17:07:42 +0000 (17:07 +0000)]
am
d323f6cf: am
3d7e0d8e: Adjust key/value backup scheduling
* commit '
d323f6cfaf1b905235930f32871fd4d0919a56c5':
Adjust key/value backup scheduling
Jeff Brown [Mon, 1 Jun 2015 17:07:34 +0000 (17:07 +0000)]
am
82f7affa: am
cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev
* commit '
82f7affa196d9efbca7f47fdb6ce96b498172829':
Tell PhoneWindowManager when we start/finish interactive changes.
Doris Liu [Mon, 1 Jun 2015 17:07:29 +0000 (17:07 +0000)]
am
dab83061: am
1501da4b: Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev
* commit '
dab830615ebb6c4dc31fc52b05143a950142f7fe':
Fix calls to Rect.intersect() in package android.view
Dirk Dougherty [Mon, 1 Jun 2015 17:07:23 +0000 (17:07 +0000)]
am
e89fe7a3: am
67f0df07: am
0e124520: am
8c11025e: Fix a date, adjust permissions language.
* commit '
e89fe7a308392db8d8533e94afddfb369a7bdb4e':
Fix a date, adjust permissions language.
Alan Viverette [Mon, 1 Jun 2015 17:02:24 +0000 (17:02 +0000)]
am
8dbdd860: am
db291132: Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev
* commit '
8dbdd860e57618a5738b5c39758fc5feb75ef58f':
Replace PNG-based seekbar thumb animation with AVD
Adrian Roos [Mon, 1 Jun 2015 16:04:27 +0000 (16:04 +0000)]
am
ddc4886f: am
b85e1ecf: Fix broken transition to secure apps when relaunching
* commit '
ddc4886f9e7ad77d99e8b649a43593e92270d609':
Fix broken transition to secure apps when relaunching
Marco Nelissen [Mon, 1 Jun 2015 16:04:22 +0000 (16:04 +0000)]
am
59984c79: am
2e2ac33e: Merge "Update ExifInterface.getDateTime to support subseconds" into mnc-dev
* commit '
59984c795dd2c93a557f25e60fb124b28fd2da19':
Update ExifInterface.getDateTime to support subseconds
ztenghui [Mon, 1 Jun 2015 16:04:05 +0000 (16:04 +0000)]
am
856846f1: am
e9d8480f: Merge "Tweak the threshold for conic path quads computation." into mnc-dev
* commit '
856846f15a533828d33f1b515a71b059f1ee9a7e':
Tweak the threshold for conic path quads computation.
Joe Fernandez [Mon, 1 Jun 2015 16:04:00 +0000 (16:04 +0000)]
am
eadb33b6: am
8c176dd2: am
927b8204: am
80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs
* commit '
eadb33b629aaa21ca888ffcf12b21d800038400a':
docs: Regen wearable docs with new redesign templates
Andrew Solovay [Mon, 1 Jun 2015 16:03:47 +0000 (16:03 +0000)]
am
5075ee2a: am
9074831a: am
def1dde3: am
1521c51c: docs: Quick fixes to screenshot
* commit '
5075ee2aa6df48d3827a09ec2671bc57c73e3eab':
docs: Quick fixes to screenshot
Olawale Ogunwale [Mon, 1 Jun 2015 16:02:38 +0000 (16:02 +0000)]
am
e1f58785: (-s ours) am
bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"
* commit '
e1f587859a2e41e309a93d2de604753bdbb14dca':
Should reset mDismissKeyguard on keyguard secure change
Filip Gruszczynski [Mon, 1 Jun 2015 15:52:05 +0000 (15:52 +0000)]
am
99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of
47249f2a to mnc-dev""" into mnc-dev
* commit '
99bcc3eee23ed8bd15bd108d068d6f9f694e4393':
Revert "Revert "resolved conflicts for merge of
47249f2a to mnc-dev""
Filip Gruszczynski [Mon, 1 Jun 2015 15:42:40 +0000 (15:42 +0000)]
Merge "Revert "Revert "resolved conflicts for merge of
47249f2a to mnc-dev""" into mnc-dev
Geoff Mendal [Mon, 1 Jun 2015 15:35:02 +0000 (15:35 +0000)]
am
c4e5ec3f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c4e5ec3f7fcc99de6aa070d463bfaeedbfd86802':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:34:58 +0000 (15:34 +0000)]
am
e4a9ecb2: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e4a9ecb20aa3c9925d57e84d60f9170da8702b5b':
Import translations. DO NOT MERGE
John Spurlock [Mon, 1 Jun 2015 15:34:53 +0000 (15:34 +0000)]
am
a58b9a2c: Merge "Battery saver: limit notification intents to system UI." into mnc-dev
* commit '
a58b9a2c06e6b0143a28cc3bf86d3f003c69b559':
Battery saver: limit notification intents to system UI.
Olawale Ogunwale [Mon, 1 Jun 2015 15:34:52 +0000 (15:34 +0000)]
am
bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"
* commit '
bf17375e5e6195122ee24295cf05f012822711ec':
Should reset mDismissKeyguard on keyguard secure change
Selim Cinek [Mon, 1 Jun 2015 15:34:48 +0000 (15:34 +0000)]
am
4bd071e5: Merge "Shortened the duration of HUNs" into mnc-dev
* commit '
4bd071e590ad5917ae81e71ad6b1d0807d8893cb':
Shortened the duration of HUNs
Olawale Ogunwale [Mon, 1 Jun 2015 15:33:56 +0000 (15:33 +0000)]
am
d147203b: am
ad2be762: Merge "Fix null pointer dereference when security exception occurs"
* commit '
d147203bc43926caddf953732682fc384ab597cb':
Fix null pointer dereference when security exception occurs
Olawale Ogunwale [Mon, 1 Jun 2015 15:33:50 +0000 (15:33 +0000)]
am
f9efac12: am
5ef53783: Merge "WindowManagerService not propagating X and Y steps"
* commit '
f9efac1291d7ada7806215d0f63661d6864e9974':
WindowManagerService not propagating X and Y steps
Chris Wren [Mon, 1 Jun 2015 15:28:25 +0000 (15:28 +0000)]
am
8517a793: am
0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev
* commit '
8517a793386bfc087dae1e94f78784f5e614b230':
add time-in-mode metrics for zen mode
Adrian Roos [Mon, 1 Jun 2015 15:28:20 +0000 (15:28 +0000)]
am
4adc3b00: am
e67f67da: Merge "Hide KeyguardMessageArea if empty" into mnc-dev
* commit '
4adc3b00915febd11e149ae0c4d4edcc02c00767':
Hide KeyguardMessageArea if empty
destradaa [Mon, 1 Jun 2015 15:28:11 +0000 (15:28 +0000)]
am
aff14c59: am
ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/
21516868
* commit '
aff14c59a04586981a75392740cea997412c8821':
Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/
21516868
Yohei Yukawa [Mon, 1 Jun 2015 15:28:01 +0000 (15:28 +0000)]
am
4ad0161a: am
650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
* commit '
4ad0161a45a872981199285a0c72d2e79de44ba5':
Revert "Rely on IMM#focusOut() to close input session."
Doris Liu [Mon, 1 Jun 2015 15:27:54 +0000 (15:27 +0000)]
am
c2713141: am
f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
* commit '
c271314154efc468022b9464a8d18eadf07a7183':
Update doc to include how clipToPadding affects EdgeEffect
Svetoslav [Mon, 1 Jun 2015 15:27:48 +0000 (15:27 +0000)]
am
80c2cc14: am
815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev
* commit '
80c2cc14e12c3f79bb617e12c0827dc0eb7e7374':
Use AtomicFile APIs correctly when reading.
Alex Klyubin [Mon, 1 Jun 2015 15:27:42 +0000 (15:27 +0000)]
am
db57c48e: am
d377b067: Merge "Cleanup Binder token resetting." into mnc-dev
* commit '
db57c48e1c34d26823bc25e2da00e1056324efb4':
Cleanup Binder token resetting.
John Spurlock [Mon, 1 Jun 2015 15:27:37 +0000 (15:27 +0000)]
am
68a00c52: am
2473e1e9: Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev
* commit '
68a00c524b38809efbc32f8c22597522b637d67c':
Zen: Dim status bar alarm icon when zen = total silence.
Jorim Jaggi [Mon, 1 Jun 2015 15:27:31 +0000 (15:27 +0000)]
am
36325016: am
2400197f: Enable Keyguard debug logging
* commit '
36325016cafcb60669455be48247327d0197dff3':
Enable Keyguard debug logging
Alex Klyubin [Mon, 1 Jun 2015 15:26:52 +0000 (15:26 +0000)]
am
1a3ab87e: am
614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev
* commit '
1a3ab87e93d26e659067298e250fe5e8cfc2e1b8':
Refactor Android Keystore CipherSpi base class.
Quddus Chong [Mon, 1 Jun 2015 15:26:46 +0000 (15:26 +0000)]
am
d5796be5: am
c1862737: am
f253e7d5: am
c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
* commit '
d5796be5e074345d073101cee2a1a2dcf825eea0':
docs: Fix issue where images are not appearing in mobile browsers. bug:
21517956
Tyler Gunn [Mon, 1 Jun 2015 15:26:39 +0000 (15:26 +0000)]
am
19eadcab: am
2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev
* commit '
19eadcaba885872491269399a1b2110c90b43ca8':
Un-@hide some missed video APIs.
John Spurlock [Mon, 1 Jun 2015 15:26:31 +0000 (15:26 +0000)]
am
f1b897e8: am
e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev
* commit '
f1b897e8b5793430a1c28e66df7e4d346cd9a9a4':
Zen: Add warning text if total silence will eat the next alarm.
Alex Klyubin [Mon, 1 Jun 2015 15:26:25 +0000 (15:26 +0000)]
am
97e7fec6: am
1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
* commit '
97e7fec63ca3c72516e478b158e9673bdfc0118f':
Add algorithm aliases for Android Keystore HMACs.
Andy Hung [Mon, 1 Jun 2015 15:26:19 +0000 (15:26 +0000)]
am
af739a10: am
51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev
* commit '
af739a10cf15c00467b90aaccc4907ce460e64de':
Clarify AudioFormat sample rate and encoding documentation
Jason Monk [Mon, 1 Jun 2015 15:26:12 +0000 (15:26 +0000)]
am
3e1bdc61: am
2280218a: Merge "Don\'t use string that has been removed." into mnc-dev
* commit '
3e1bdc61d85b9cc135cd52c0f05c0665d93621d5':
Don't use string that has been removed.
Glenn Kasten [Mon, 1 Jun 2015 15:26:06 +0000 (15:26 +0000)]
James Cook [Mon, 1 Jun 2015 15:26:00 +0000 (15:26 +0000)]
am
3c668bac: am
63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
* commit '
3c668bac5a670999719e2a5c9d8a719b5422ea38':
assist: Fix reported colors/styles for TextView/Switch
Tony Mantler [Mon, 1 Jun 2015 15:25:54 +0000 (15:25 +0000)]
am
29ef4811: am
85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev
* commit '
29ef481165b2362c1fc91219b09f8a1f4b24e246':
Move ZoneGetter into SettingsLib
Geoff Mendal [Mon, 1 Jun 2015 15:25:47 +0000 (15:25 +0000)]
am
c5508f85: (-s ours) am
55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
c5508f8560b48a195f5b19dab98b0bc1bb85928b':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Jun 2015 15:25:42 +0000 (15:25 +0000)]
am
8474bf48: (-s ours) am
8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
8474bf48aa37487270e335441005cea19515cf13':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 1 Jun 2015 15:25:36 +0000 (15:25 +0000)]
am
6c15c153: (-s ours) am
99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
* commit '
6c15c153fa831264f1134b703107acf40e206728':
Revert "Import translations. DO NOT MERGE"
John Spurlock [Mon, 1 Jun 2015 15:25:31 +0000 (15:25 +0000)]
am
8cf1276c: am
4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev
* commit '
8cf1276c8e08abcfe744309d3ce78f3e7b37ed31':
Tuner: add battery pct preference.
Geoff Mendal [Mon, 1 Jun 2015 15:25:25 +0000 (15:25 +0000)]
am
060b2ce9: (-s ours) am
e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
060b2ce9eaf77155024676f419ca37aa6c5ab895':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:25:20 +0000 (15:25 +0000)]
am
76625fec: (-s ours) am
0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
76625fec224a0fffa0664060f72d6cc1a7e9ba49':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:25:15 +0000 (15:25 +0000)]
am
57103ebf: (-s ours) am
df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
57103ebfa6188b2c421ba860d7063b62ca935af5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 15:25:10 +0000 (15:25 +0000)]
am
408606f3: (-s ours) am
78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
408606f31eb126bad9a8c1da28026ffe9c4943f4':
Import translations. DO NOT MERGE
Xiyuan Xia [Mon, 1 Jun 2015 15:25:02 +0000 (15:25 +0000)]
am
223826b3: am
e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
* commit '
223826b3cd1c7dc00706efc137b8a4dcaf7595fa':
Avoid keyguard UI layout dimensions underflow
Geoff Mendal [Mon, 1 Jun 2015 15:24:55 +0000 (15:24 +0000)]
am
7ec9264f: (-s ours) am
642c4fc5: (-s ours) Import translations. DO NOT MERGE
* commit '
7ec9264f40087f48dcab821c65a93f8628dd0e93':
Import translations. DO NOT MERGE
Narayan Kamath [Mon, 1 Jun 2015 15:24:49 +0000 (15:24 +0000)]
am
2de63d7c: am
d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev
* commit '
2de63d7cc1398fe699cc2a16b47647674e4efb64':
Avoid inspecting packages twice to deduce ABIs for moves / installs.
John Spurlock [Mon, 1 Jun 2015 15:24:42 +0000 (15:24 +0000)]
am
015a95ff: am
6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
* commit '
015a95ff35e5e9de959c10d082fbe2e10c58885c':
Zen: Use account name instead of calendar id in event conditions.
Selim Cinek [Mon, 1 Jun 2015 15:24:32 +0000 (15:24 +0000)]
am
4dbe7c0d: am
ff3bf4b1: Increased the falsing treashold for quick settings
* commit '
4dbe7c0d16944ba4b8df4216f730acfc06818eca':
Increased the falsing treashold for quick settings
Dirk Dougherty [Mon, 1 Jun 2015 15:24:23 +0000 (15:24 +0000)]
am
4b9d724c: am
34cca12b: am
906a91b4: am
08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
* commit '
4b9d724cd666bdad3703f383be8c024f4a6016a1':
Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
David Friedman [Mon, 1 Jun 2015 15:24:15 +0000 (15:24 +0000)]
am
bc0e7f28: am
95af201a: am
2ed3a89c: am
90042a5f: Docs: Corrects technical content of one sentence, and deletes another.
* commit '
bc0e7f287599e90a44ab249ba2fc0673ddfaf609':
Docs: Corrects technical content of one sentence, and deletes another.
Guang Zhu [Mon, 1 Jun 2015 15:24:03 +0000 (15:24 +0000)]
am
0ca15144: am
9bb76544: fix NPE in shutdown thread
* commit '
0ca15144e375e7439a64fabcbb53d6813135cfc4':
fix NPE in shutdown thread
Andrew Solovay [Mon, 1 Jun 2015 15:23:55 +0000 (15:23 +0000)]
am
74f4e4f1: am
832654a8: am
2f85475c: am
7d36a250: docs: Quick spelling fix
* commit '
74f4e4f1b8016a586d6a0b3ca6ebe06840c21573':
docs: Quick spelling fix
Sungsoo Lim [Mon, 1 Jun 2015 15:23:46 +0000 (15:23 +0000)]
am
f819ac38: am
6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev
* commit '
f819ac38a9647a8d7d00bca83f176e32a415517e':
Send a message with data in MediaController.MessageHandler.post()
Yorke Lee [Mon, 1 Jun 2015 15:23:37 +0000 (15:23 +0000)]
am
923df3da: am
d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev
* commit '
923df3da935b006b983ea1837538f6baecf26b86':
Make ACTION_CONNECTION_SERVICE_CONFIGURE public
Glenn Kasten [Mon, 1 Jun 2015 15:23:23 +0000 (15:23 +0000)]
am
a84e73a7: am
ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev
* commit '
a84e73a7bc99e4ef5c50125400d319a4124b4296':
Improve error handling for AudioTrack write with PTS
Raph Levien [Mon, 1 Jun 2015 15:23:16 +0000 (15:23 +0000)]
am
023973ec: am
71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
* commit '
023973ecc66c62f2b83d9154097bb370966ed96d':
Use getRunAdvance to position cursor
Alan Viverette [Mon, 1 Jun 2015 15:23:09 +0000 (15:23 +0000)]
am
4e419432: am
a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev
* commit '
4e419432e1717de6154ea5c8177c519fe449b8f0':
Synchronize Theme.Material and Theme.Material light attributes
Makoto Onuki [Mon, 1 Jun 2015 15:23:03 +0000 (15:23 +0000)]
am
8c48834b: am
0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev
* commit '
8c48834b112cf10d43bacd668aadf6f3cf4a9ad1':
CountryDetector no longer requires location permissions.
Yohei Yukawa [Mon, 1 Jun 2015 15:22:58 +0000 (15:22 +0000)]
am
92086e06: am
5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
* commit '
92086e06ad3167ebfadbc746d32e86c335878a8f':
Rely on IMM#focusOut() to close input session.
Brian Attwell [Mon, 1 Jun 2015 15:22:52 +0000 (15:22 +0000)]
am
4ababd27: am
19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev
* commit '
4ababd27401db430afb2f30d29efce972f8b1ccb':
Rename "end" to "endExclusive" in addPhoneTtsSpan
Alan Viverette [Mon, 1 Jun 2015 15:22:47 +0000 (15:22 +0000)]
am
9ddcef8e: am
3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev
* commit '
9ddcef8eec56bd161d8f8e91c854b740232f6a64':
Postpone AnimatedVectorDrawable animator inflation until applyTheme()
Andres Morales [Mon, 1 Jun 2015 15:22:42 +0000 (15:22 +0000)]
am
8d61ab00: am
a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
* commit '
8d61ab0003e26952349a959a4a38d3ebdea664d0':
[partition checking] re-enable bootimage/bootloader, add recovery
Geoff Mendal [Mon, 1 Jun 2015 15:19:48 +0000 (15:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 1 Jun 2015 15:19:18 +0000 (15:19 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
John Spurlock [Mon, 1 Jun 2015 15:04:25 +0000 (15:04 +0000)]
Merge "Battery saver: limit notification intents to system UI." into mnc-dev
Olawale Ogunwale [Mon, 1 Jun 2015 15:00:12 +0000 (15:00 +0000)]
Merge "Should reset mDismissKeyguard on keyguard secure change"
Olawale Ogunwale [Mon, 1 Jun 2015 14:59:15 +0000 (14:59 +0000)]
am
ad2be762: Merge "Fix null pointer dereference when security exception occurs"
* commit '
ad2be762f2f0ff9f3c01e729e307920cef6e2904':
Fix null pointer dereference when security exception occurs
Olawale Ogunwale [Mon, 1 Jun 2015 14:59:08 +0000 (14:59 +0000)]
am
5ef53783: Merge "WindowManagerService not propagating X and Y steps"
* commit '
5ef53783743c7a7fb2339274ddb0886b0eb789ec':
WindowManagerService not propagating X and Y steps
John Spurlock [Mon, 1 Jun 2015 14:56:42 +0000 (10:56 -0400)]
Battery saver: limit notification intents to system UI.
Ensure the actions taken by the HUN warnings came from sysui.
Bug:
20918350
Change-Id: I8dc02ebdfcc1f60d068bea43e10e350dc566728d