OSDN Git Service
Chris Tate [Mon, 1 Jun 2015 20:27:42 +0000 (20:27 +0000)]
am
598d143a: am
88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
* commit '
598d143a0e0b211e3929a355afbffb7719404f1a':
DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.
John Spurlock [Mon, 1 Jun 2015 20:27:37 +0000 (20:27 +0000)]
am
587ae867: am
b0db15c6: Merge "Next alarm clock updates." into mnc-dev
* commit '
587ae8679d425bc18771a07622279c566e590db3':
Next alarm clock updates.
Andrew Flynn [Mon, 1 Jun 2015 20:27:32 +0000 (20:27 +0000)]
am
19390a64: am
78b16987: Merge "Change colors of AVD test" into mnc-dev
* commit '
19390a6458ed14ed35d5d7c36dbfd1c58bee1b90':
Change colors of AVD test
Chris Tate [Mon, 1 Jun 2015 20:20:54 +0000 (20:20 +0000)]
am
88fb1453: Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
* commit '
88fb14532421f049614c34120c706c26a9af6bbd':
DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order.
John Spurlock [Mon, 1 Jun 2015 20:13:03 +0000 (20:13 +0000)]
am
b0db15c6: Merge "Next alarm clock updates." into mnc-dev
* commit '
b0db15c6d99ab5f9d8a7bd6a44fc097a5f61edca':
Next alarm clock updates.
Andrew Flynn [Mon, 1 Jun 2015 20:12:53 +0000 (20:12 +0000)]
am
78b16987: Merge "Change colors of AVD test" into mnc-dev
* commit '
78b16987dfb044c8adbb19d2cd206a8aaeb6e850':
Change colors of AVD test
Chris Tate [Mon, 1 Jun 2015 20:11:56 +0000 (20:11 +0000)]
Merge "DO NOT MERGE Fix bug regarding the comparator sorts Alarms into increasing time order." into mnc-dev
John Spurlock [Mon, 1 Jun 2015 20:07:38 +0000 (20:07 +0000)]
Merge "Next alarm clock updates." into mnc-dev
Raph Levien [Mon, 1 Jun 2015 20:06:24 +0000 (20:06 +0000)]
am
c73314bc: am
cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
* commit '
c73314bcb18f6879bb6f9923912ab38a0c831637':
Revert "Use getRunAdvance to position cursor"
Jason Monk [Mon, 1 Jun 2015 20:06:19 +0000 (20:06 +0000)]
am
eeee276b: am
061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev
* commit '
eeee276b31260425098b321ddd089c6e005b6583':
Be more careful with mAccessPoints usage
Andrew Flynn [Mon, 1 Jun 2015 20:04:06 +0000 (20:04 +0000)]
Merge "Change colors of AVD test" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 19:55:12 +0000 (19:55 +0000)]
am
cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
* commit '
cf8b3b1c56b5aaaa8552c1bc9bb88c8a1285f99f':
Revert "Use getRunAdvance to position cursor"
Jason Monk [Mon, 1 Jun 2015 19:55:08 +0000 (19:55 +0000)]
am
061e2bbf: Merge "Be more careful with mAccessPoints usage" into mnc-dev
* commit '
061e2bbf6bdbcccd71844248be953081f2b5fe70':
Be more careful with mAccessPoints usage
Raph Levien [Mon, 1 Jun 2015 19:45:24 +0000 (19:45 +0000)]
Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:45:22 +0000 (19:45 +0000)]
Merge "Be more careful with mAccessPoints usage" into mnc-dev
Raph Levien [Mon, 1 Jun 2015 19:40:42 +0000 (12:40 -0700)]
Revert "Use getRunAdvance to position cursor"
This reverts commit
cb5499c85097450c48f66f6c08a35bab2ad5ab12.
Bug:
21549197
Jorim Jaggi [Mon, 1 Jun 2015 19:29:19 +0000 (19:29 +0000)]
am
c8d5901b: am
1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
* commit '
c8d5901bc83814c0dab281fc108de643cdd7b09d':
Cleanup Keyguard handling when turning off screen
Filip Gruszczynski [Mon, 1 Jun 2015 19:29:14 +0000 (19:29 +0000)]
am
49895c6e: am
29c840eb: am
11d50c9c: am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
49895c6eadcca35bfe4369b53c8fc2e13a603520':
Dismiss or cancel in SwipeDismissLayout on screen off.
Wale Ogunwale [Mon, 1 Jun 2015 19:29:10 +0000 (19:29 +0000)]
am
320b9534: am
4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
* commit '
320b953417ef8a048ede95ba933046b60c3b7532':
Allow app to stop lockTaskMode if started by manifest attribute
Jorim Jaggi [Mon, 1 Jun 2015 19:18:29 +0000 (19:18 +0000)]
am
1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
* commit '
1e47a8e096fc28dcab0a55bc4f2e6b747bfb1a07':
Cleanup Keyguard handling when turning off screen
Filip Gruszczynski [Mon, 1 Jun 2015 19:18:25 +0000 (19:18 +0000)]
am
29c840eb: am
11d50c9c: am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
29c840ebb08d97451fd5a5923ad20d7bf1990048':
Dismiss or cancel in SwipeDismissLayout on screen off.
Wale Ogunwale [Mon, 1 Jun 2015 19:18:20 +0000 (19:18 +0000)]
am
4021117d: Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
* commit '
4021117d0a78f89c9c9e5acc0e4d61092952e5f5':
Allow app to stop lockTaskMode if started by manifest attribute
Jorim Jaggi [Mon, 1 Jun 2015 19:13:10 +0000 (19:13 +0000)]
Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev
Filip Gruszczynski [Mon, 1 Jun 2015 19:09:57 +0000 (19:09 +0000)]
am
11d50c9c: am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
11d50c9cc6f9990af5b9abf2058f6b7d4a5c8ae0':
Dismiss or cancel in SwipeDismissLayout on screen off.
Wale Ogunwale [Mon, 1 Jun 2015 19:06:44 +0000 (19:06 +0000)]
Merge "Allow app to stop lockTaskMode if started by manifest attribute" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:00:57 +0000 (15:00 -0400)]
Be more careful with mAccessPoints usage
Bug:
21559453
Change-Id: I1a0bcf7282ad1a651169dea7e8ac5bc618b580d1
Filip Gruszczynski [Mon, 1 Jun 2015 18:57:21 +0000 (18:57 +0000)]
am
06756f35: Dismiss or cancel in SwipeDismissLayout on screen off.
* commit '
06756f352d2046246bc147fa1f55d1dfbfcb37f5':
Dismiss or cancel in SwipeDismissLayout on screen off.
Winson Chung [Mon, 1 Jun 2015 18:52:07 +0000 (18:52 +0000)]
am
85fe74c3: am
6920474b: Merge "Ensuring that we write to disk first." into mnc-dev
* commit '
85fe74c3478f6bb1b2e72950697815d1eeadfec3':
Ensuring that we write to disk first.
Winson Chung [Mon, 1 Jun 2015 18:52:03 +0000 (18:52 +0000)]
am
a83faa66: am
a74f385b: Allow long-pressing task icon to show app-info.
* commit '
a83faa666f173d329370b7d17e53b0dfc219354c':
Allow long-pressing task icon to show app-info.
Yorke Lee [Mon, 1 Jun 2015 18:51:53 +0000 (18:51 +0000)]
am
4f606433: am
064fc83b: Merge "Add ability to modify default dialer via ADB" into mnc-dev
* commit '
4f606433ead5f76d2b49715fc208458f7ca933dc':
Add ability to modify default dialer via ADB
Alan Viverette [Mon, 1 Jun 2015 18:51:48 +0000 (18:51 +0000)]
am
c6296a76: am
0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev
* commit '
c6296a76869422fd698ada889a74bc3129792db5':
Prevent crash when ColorStateList has unresolved attrs
Yin-Chia Yeh [Mon, 1 Jun 2015 18:51:43 +0000 (18:51 +0000)]
am
21f55342: am
254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev
* commit '
21f55342d60e54c9e899aa746cf1a848f2910e61':
Camera2: Add missing LEGACY available keys
Alex Klyubin [Mon, 1 Jun 2015 18:51:38 +0000 (18:51 +0000)]
am
18fa9176: am
0de6dea6: Merge "No need to specify key size when importing." into mnc-dev
* commit '
18fa91765a00925787ee9214ad044dac28c77b76':
No need to specify key size when importing.
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""
Wale Ogunwale [Mon, 1 Jun 2015 16:48:36 +0000 (09:48 -0700)]
Allow app to stop lockTaskMode if started by manifest attribute
It is possible lockTaskMode was started by the system process
because android:lockTaskMode is set to a locking value in the
application's manifest instead of the app calling
startLockTaskMode. In this case TaskRecord.mLockTaskUid will
be 0, so we compare the callingUid to the
TaskRecord.effectiveUid instead so the app can exit lockTaskMode.
Bug:
21464182
Change-Id: Ibca6de8e4b17051d5fcbb05cde9c8aefed7216f2
Winson Chung [Mon, 1 Jun 2015 18:23:41 +0000 (18:23 +0000)]
am
6920474b: Merge "Ensuring that we write to disk first." into mnc-dev
* commit '
6920474bac7c212dd384b6ef1134c59b73669942':
Ensuring that we write to disk first.
Winson Chung [Mon, 1 Jun 2015 18:23:37 +0000 (18:23 +0000)]
am
a74f385b: Allow long-pressing task icon to show app-info.
* commit '
a74f385ba08922c09aa812f0d6fd2903a633da01':
Allow long-pressing task icon to show app-info.
Winson Chung [Mon, 1 Jun 2015 18:19:44 +0000 (18:19 +0000)]
Merge "Ensuring that we write to disk first." into mnc-dev
Winson Chung [Fri, 29 May 2015 20:36:56 +0000 (13:36 -0700)]
Ensuring that we write to disk first.
Change-Id: I2c55db77ab6feef1b405858aac53fb0ed3370dc2
Winson Chung [Fri, 29 May 2015 23:27:00 +0000 (16:27 -0700)]
Allow long-pressing task icon to show app-info.
Bug:
17369696
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
Yorke Lee [Mon, 1 Jun 2015 18:05:15 +0000 (18:05 +0000)]
am
064fc83b: Merge "Add ability to modify default dialer via ADB" into mnc-dev
* commit '
064fc83b81e215881c2ad22827741e6e9142f948':
Add ability to modify default dialer via ADB
Alan Viverette [Mon, 1 Jun 2015 18:05:09 +0000 (18:05 +0000)]
am
0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev
* commit '
0ee2c1aef93987663968dbfd693cc5eda06c8244':
Prevent crash when ColorStateList has unresolved attrs
Yin-Chia Yeh [Mon, 1 Jun 2015 18:05:05 +0000 (18:05 +0000)]
am
254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev
* commit '
254ed616712866518225dbc156182f39339e76a4':
Camera2: Add missing LEGACY available keys
Alex Klyubin [Mon, 1 Jun 2015 18:05:00 +0000 (18:05 +0000)]
am
0de6dea6: Merge "No need to specify key size when importing." into mnc-dev
* commit '
0de6dea6fb0c3b87e967c4c223f5edda359d1c8c':
No need to specify key size when importing.
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
Yorke Lee [Mon, 1 Jun 2015 18:00:49 +0000 (18:00 +0000)]
Merge "Add ability to modify default dialer via ADB" into mnc-dev
Alan Viverette [Mon, 1 Jun 2015 18:00:05 +0000 (18:00 +0000)]
Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev
Yin-Chia Yeh [Mon, 1 Jun 2015 17:53:40 +0000 (17:53 +0000)]
Merge "Camera2: Add missing LEGACY available keys" into mnc-dev
Alex Klyubin [Mon, 1 Jun 2015 17:53:28 +0000 (17:53 +0000)]
Merge "No need to specify key size when importing." into mnc-dev
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:45:49 +0000 (10:45 -0700)]
Prevent crash when ColorStateList has unresolved attrs
Bug:
21471789
Change-Id: Ieba6ab62b5e82eb716934a65efb6bfef2fc4e15a
Yin-Chia Yeh [Thu, 28 May 2015 22:58:22 +0000 (15:58 -0700)]
Camera2: Add missing LEGACY available keys
Add missing available characteristics keys.
Bug:
20883751
Change-Id: I6f07deca4b469de720f44a663ce9140658c346f1
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
Filip Gruszczynski [Mon, 1 Jun 2015 17:09:45 +0000 (10:09 -0700)]
Dismiss or cancel in SwipeDismissLayout on screen off.
Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.
Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a
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
OSDN Git Service
