OSDN Git Service
Andres Morales [Mon, 1 Jun 2015 18:51:32 +0000 (18:51 +0000)]
am
9250d972: am
0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev
* commit '
9250d9727b5a71267cb33b535bdd959c1c03b11a':
Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
Chien-Yu Chen [Mon, 1 Jun 2015 18:51:27 +0000 (18:51 +0000)]
am
a56dee8e: am
61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev
* commit '
a56dee8edecddfe298d348c4006de6dea0e92374':
Camera2: update docs for reprocess timestamp
Alan Viverette [Mon, 1 Jun 2015 18:51:12 +0000 (18:51 +0000)]
am
af3134ae: am
9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev
* commit '
af3134ae74538bf716da8ecdc0a07f29e5bdc145':
Don't ignore explicit dividerHeight of 0 specified in XML
Alan Viverette [Mon, 1 Jun 2015 18:50:46 +0000 (18:50 +0000)]
am
508b6d2d: am
242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
* commit '
508b6d2d576b1bdd528362fbb069961a9a65c2fb':
Fix row/column order when unparcelling CollectionItemInfo
Stuart Scott [Mon, 1 Jun 2015 18:50:39 +0000 (18:50 +0000)]
am
378c2cbf: am
e3e314df: Network Reset should have a lockdown like Factory Reset.
* commit '
378c2cbf2ebc2e3668da7d5a285fe3ec6b9d7ee8':
Network Reset should have a lockdown like Factory Reset.
Joe Fernandez [Mon, 1 Jun 2015 18:50:30 +0000 (18:50 +0000)]
am
2f752f8f: am
540d0e0d: am
583b7f2c: am
9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
* commit '
2f752f8f771c269d5e2486067569d78850f105b5':
docs: Android Dashboard - June 2015 update
Filip Gruszczynski [Mon, 1 Jun 2015 18:50:25 +0000 (18:50 +0000)]
am
2e7e5c1c: am
48fe2631: resolved conflicts for merge of
a61e23f1 to mnc-dev
* commit '
2e7e5c1cbfeea58e5d083679a857d75c090f3289':
Only use outsets for full screen windows.
Mady Mellor [Mon, 1 Jun 2015 18:50:15 +0000 (18:50 +0000)]
am
8de52276: am
3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
* commit '
8de52276a1f5faf83ea8147f0ddee74195279bba':
Update button to BUTTON_STYLUS_PRIMARY
Mady Mellor [Mon, 1 Jun 2015 18:50:09 +0000 (18:50 +0000)]
am
8c189479: am
ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev
* commit '
8c189479a02dfae2874a622dd79abcbcded0c809':
Update stylus button press recognition in View to use new MotionEvent APIs
Mady Mellor [Mon, 1 Jun 2015 18:50:04 +0000 (18:50 +0000)]
am
ed836dec: am
cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev
* commit '
ed836decd81c2b8d894bf2fd658f45a761f795cd':
Update stylus button press recognition in GestureDetector to use new APIs
Filip Gruszczynski [Mon, 1 Jun 2015 18:49:58 +0000 (18:49 +0000)]
am
6f68b90e: am
8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev
* commit '
6f68b90ebf7714a628b110a2c4c534c17d7e20d2':
Revert "Revert "Fix build.""
smain@google.com [Mon, 1 Jun 2015 18:49:53 +0000 (18:49 +0000)]
am
b42f1007: am
b3054109: am
67725e2a: am
7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
* commit '
b42f1007b3227ba2b1b20590031585f9603c3f94':
add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
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
Andres Morales [Mon, 1 Jun 2015 18:04:56 +0000 (18:04 +0000)]
am
0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev
* commit '
0fddb1a63109e2d4a92327ea1ffc74307292be48':
Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
Chien-Yu Chen [Mon, 1 Jun 2015 18:04:48 +0000 (18:04 +0000)]
am
61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev
* commit '
61bae6d8de096c8982074ac507554fda42a802a5':
Camera2: update docs for reprocess timestamp
Andres Morales [Mon, 1 Jun 2015 17:50:57 +0000 (17:50 +0000)]
Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev
Chien-Yu Chen [Mon, 1 Jun 2015 17:50:54 +0000 (17:50 +0000)]
Merge "Camera2: update docs for reprocess timestamp" into mnc-dev
Andres Morales [Mon, 1 Jun 2015 17:50:43 +0000 (17:50 +0000)]
Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
This reverts commit
831e01a89e9636baf15d35e7f8ff5e9f290c8b87.
Change-Id: I48bf74631b842178964d25906b2790f18632e32a
Alan Viverette [Mon, 1 Jun 2015 17:44:03 +0000 (17:44 +0000)]
am
9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev
* commit '
9be801c8269358ded8e4bed6103ca2346da7e179':
Don't ignore explicit dividerHeight of 0 specified in XML
Alan Viverette [Mon, 1 Jun 2015 17:33:15 +0000 (17:33 +0000)]
Merge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 17:30:21 +0000 (10:30 -0700)]
Don't ignore explicit dividerHeight of 0 specified in XML
Also minor cleanup and adding annotations.
Bug:
21420748
Change-Id: I89edcd3ce423ad75a4028bebf0dcd828b9619c15
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
Alan Viverette [Mon, 1 Jun 2015 16:44:03 +0000 (16:44 +0000)]
am
242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
* commit '
242b9c4eee9d42d02fd2259ffe2124234653aaf2':
Fix row/column order when unparcelling CollectionItemInfo
Stuart Scott [Mon, 1 Jun 2015 16:43:58 +0000 (16:43 +0000)]
am
e3e314df: Network Reset should have a lockdown like Factory Reset.
* commit '
e3e314df4d52881225326d426a76e3e7f1bc40d3':
Network Reset should have a lockdown like Factory Reset.
Alan Viverette [Mon, 1 Jun 2015 16:39:09 +0000 (16:39 +0000)]
Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
Joe Fernandez [Mon, 1 Jun 2015 16:33:21 +0000 (16:33 +0000)]
am
540d0e0d: am
583b7f2c: am
9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
* commit '
540d0e0d834da68bfd6377dd35ed29ed1765d106':
docs: Android Dashboard - June 2015 update
Filip Gruszczynski [Mon, 1 Jun 2015 16:33:17 +0000 (16:33 +0000)]
am
48fe2631: resolved conflicts for merge of
a61e23f1 to mnc-dev
* commit '
48fe2631373931d8ab4a403791dd09394519acf6':
Only use outsets for full screen windows.
Stuart Scott [Mon, 20 Apr 2015 21:07:45 +0000 (14:07 -0700)]
Network Reset should have a lockdown like Factory Reset.
bug:
20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit
94b038bbb291431a7b39611d72f206b07e839891)
Joe Fernandez [Mon, 1 Jun 2015 16:26:12 +0000 (16:26 +0000)]
am
583b7f2c: am
9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
* commit '
583b7f2c6dacc412016c15a21f5376fc7fc0e88b':
docs: Android Dashboard - June 2015 update
Mady Mellor [Mon, 1 Jun 2015 16:24:25 +0000 (16:24 +0000)]
am
3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
* commit '
3aa33b3da04774d76e1a65b749667450dc81532b':
Update button to BUTTON_STYLUS_PRIMARY
Mady Mellor [Mon, 1 Jun 2015 16:24:21 +0000 (16:24 +0000)]
am
ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev
* commit '
ef24bc00399ceb627e9780f05eb68f955e6bd495':
Update stylus button press recognition in View to use new MotionEvent APIs
Mady Mellor [Mon, 1 Jun 2015 16:24:16 +0000 (16:24 +0000)]
am
cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev
* commit '
cac7b2b17505dd3d84966ff15abf5e5343783dee':
Update stylus button press recognition in GestureDetector to use new APIs
Filip Gruszczynski [Mon, 1 Jun 2015 16:23:14 +0000 (09:23 -0700)]
resolved conflicts for merge of
a61e23f1 to mnc-dev
Change-Id: Ief5ad11d4f97ae6dbe2d26420550dd145811becc
Mady Mellor [Mon, 1 Jun 2015 16:17:36 +0000 (16:17 +0000)]
Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
Mady Mellor [Mon, 1 Jun 2015 16:16:16 +0000 (16:16 +0000)]
Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev
Mady Mellor [Mon, 1 Jun 2015 16:15:52 +0000 (16:15 +0000)]
Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:12:35 +0000 (16:12 +0000)]
am
8825de17: Merge "Revert "Revert "Fix build.""" into mnc-dev
* commit '
8825de1751b4362d3a6fce2e402c51e481bb2729':
Revert "Revert "Fix build.""
smain@google.com [Mon, 1 Jun 2015 16:12:32 +0000 (16:12 +0000)]
am
b3054109: am
67725e2a: am
7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
* commit '
b305410962eba135605c87ed246b2d7051d4e86a':
add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
Filip Gruszczynski [Mon, 1 Jun 2015 16:07:47 +0000 (16:07 +0000)]
Merge "Revert "Revert "Fix build.""" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 16:07:36 +0000 (16:07 +0000)]
Revert "Revert "Fix build.""
This reverts commit
944a6c937cd3576ecae5c3fdd0dcf265329e6bcf.
Change-Id: I7daa255f331a1e39308eb626580aa00c63c5cb3e
Joe Fernandez [Mon, 1 Jun 2015 16:06:26 +0000 (16:06 +0000)]
am
9bf0e9d0: Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
* commit '
9bf0e9d03f805bbbb10b87df0586cf6953f18e98':
docs: Android Dashboard - June 2015 update
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
Alan Viverette [Mon, 1 Jun 2015 16:03:27 +0000 (09:03 -0700)]
Fix row/column order when unparcelling CollectionItemInfo
Bug:
21527853
Change-Id: I02a75b9395a4d573f5fd49abcbd282b35e2c8f3c
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
smain@google.com [Mon, 1 Jun 2015 16:01:30 +0000 (16:01 +0000)]
am
67725e2a: am
7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
* commit '
67725e2aa47596207ebffc00e3737c609536fe93':
add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
Filip Gruszczynski [Mon, 1 Jun 2015 16:01:16 +0000 (16:01 +0000)]
am
35a803be: Only use outsets for full screen windows.
* commit '
35a803beec9ce508fd53ab7e4111f2f9f87296c1':
Only use outsets for full screen windows.
Joe Fernandez [Mon, 1 Jun 2015 15:52:31 +0000 (15:52 +0000)]
Merge "docs: Android Dashboard - June 2015 update" into mnc-preview-docs
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""
Joe Fernandez [Mon, 1 Jun 2015 15:47:19 +0000 (08:47 -0700)]
docs: Android Dashboard - June 2015 update
Change-Id: I81709ea7f4d5ac0abfbd2834c98c4e05b4904878
smain@google.com [Mon, 1 Jun 2015 15:42:57 +0000 (15:42 +0000)]
am
7f6da0c3: add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
* commit '
7f6da0c3cbb9b38d345f7c575d1069d2a85099e5':
add back the GMS and GCM reference lists to fix search suggest. mistakenly removed during: https://googleplex-android-review.git.corp.google.com/#/c/697534/1
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
Filip Gruszczynski [Wed, 27 May 2015 22:38:29 +0000 (15:38 -0700)]
Only use outsets for full screen windows.
Change-Id: I1d89c314b0f9944dfa417ce066c397073d51466e
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.
OSDN Git Service
