OSDN Git Service
Wale Ogunwale [Fri, 24 Apr 2015 22:26:04 +0000 (22:26 +0000)]
am
e2047da6: am
d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit '
e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
Revert "Clean-up state if we have an exception when acquiring provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:14:56 +0000 (22:14 +0000)]
am
d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit '
d9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
Revert "Clean-up state if we have an exception when acquiring provider"
Kenny Root [Fri, 24 Apr 2015 22:00:56 +0000 (22:00 +0000)]
am
8652bce1: am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
8652bce13765fb29329df2a4ccca4591bae28de5':
frameworks/base: switch to using NativeConstants.
Kenny Root [Fri, 24 Apr 2015 21:49:47 +0000 (21:49 +0000)]
am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
c71f264847eb75d53c0f99e6e1c42a8a1527d3b4':
frameworks/base: switch to using NativeConstants.
Wale Ogunwale [Fri, 24 Apr 2015 21:49:41 +0000 (21:49 +0000)]
Merge "Revert "Clean-up state if we have an exception when acquiring provider""
Wale Ogunwale [Fri, 24 Apr 2015 21:44:54 +0000 (14:44 -0700)]
Revert "Clean-up state if we have an exception when acquiring provider"
This reverts commit
73e239bdc9493d81215d5afe739b3ed095686ba2.
Bug:
20091132
Kenny Root [Fri, 24 Apr 2015 21:26:06 +0000 (21:26 +0000)]
Merge "frameworks/base: switch to using NativeConstants."
Alex Klyubin [Fri, 24 Apr 2015 20:35:26 +0000 (20:35 +0000)]
am
b068ae14: am
e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
* commit '
b068ae143df2c2f3030da23d7fc130f735975867':
No runtime exceptions during normal use of AndroidKeyStore crypto.
Alex Klyubin [Fri, 24 Apr 2015 20:22:58 +0000 (20:22 +0000)]
am
e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
* commit '
e2b9bb45d20102f121660ed361bd4225852a55e0':
No runtime exceptions during normal use of AndroidKeyStore crypto.
Alex Klyubin [Fri, 24 Apr 2015 20:00:57 +0000 (20:00 +0000)]
Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
Quddus Chong [Fri, 24 Apr 2015 19:56:39 +0000 (19:56 +0000)]
am
9774e8ab: Merge "docs: Updated What\'s New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
* commit '
9774e8ab0890d694840c883f309916a444b3ee54':
docs: Updated What's New for GMS v7.3 to remove Maps support for Wear.
Quddus Chong [Fri, 24 Apr 2015 19:48:03 +0000 (19:48 +0000)]
Merge "docs: Updated What's New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
Scott Rowe [Fri, 24 Apr 2015 18:52:35 +0000 (18:52 +0000)]
am
5e95a917: am
17c0b254: am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
5e95a91707ecd53c1ab0eb688513a2328271f9a2':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 24 Apr 2015 18:43:03 +0000 (18:43 +0000)]
am
17c0b254: am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
17c0b25441a264efe87ab2db82c04c0e018c178c':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 24 Apr 2015 18:30:07 +0000 (18:30 +0000)]
am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
ccfedfccbe63af223027471ea80869d0fb011098':
docs: Supported media protocols, codecs, formats for Android TV
Alex Klyubin [Fri, 24 Apr 2015 18:21:22 +0000 (18:21 +0000)]
am
3167fb4b: am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
3167fb4b6e190705d21a76b34cc376a89675a6a0':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:21:19 +0000 (18:21 +0000)]
am
6d856bfb: am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
6d856bfba5b6ae488d49c4909510cd87000cd922':
[ActivityManager] Avoid orphan ContentProviderRecord.
Leon Scroggins III [Fri, 24 Apr 2015 18:16:34 +0000 (18:16 +0000)]
am
8be18bbf: am
4c1f70db: am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
8be18bbfc23b768ae3022f988e586871754958ac':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 18:16:29 +0000 (18:16 +0000)]
am
60d7c9fc: am
6db29a92: am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
60d7c9fcbcb80c556689f03c7b00984f94f9912b':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Scott Rowe [Fri, 24 Apr 2015 18:16:26 +0000 (18:16 +0000)]
am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
5827af11bdcd9973afe04cb035e83c6428d1e562':
docs: Supported media protocols, codecs, formats for Android TV
Alex Klyubin [Fri, 24 Apr 2015 18:11:50 +0000 (18:11 +0000)]
am
71223ebe: Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
* commit '
71223ebe1b2264b7463a02c8dafd779eb3b8c210':
Reset AndroidKeyStore Mac and Cipher state when init fails.
Olawale Ogunwale [Fri, 24 Apr 2015 18:11:29 +0000 (18:11 +0000)]
am
cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
* commit '
cf7d2d95adb358a628c2622b43a999d3ab784406':
[ActivityManager] Avoid orphan ContentProviderRecord.
Scott Rowe [Fri, 24 Apr 2015 18:10:25 +0000 (18:10 +0000)]
am
6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
* commit '
6e5063fe88b265c89b39401545925b9e0cbd8390':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 24 Apr 2015 18:01:15 +0000 (18:01 +0000)]
am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
02e4f2fbe6e0511789d42d5942548158d2dd154f':
docs: Supported media protocols, codecs, formats for Android TV
Scott Rowe [Fri, 20 Mar 2015 17:44:52 +0000 (10:44 -0700)]
docs: Supported media protocols, codecs, formats for Android TV
Change-Id: I8202ba148d35d73ee0940070090e0a29553f9202
(cherry picked from commit
f769caa8c15f9983188597e2436b011d23ff2561)
Leon Scroggins III [Fri, 24 Apr 2015 17:54:57 +0000 (17:54 +0000)]
am
4c1f70db: am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
4c1f70db3dc37f818bdff09ec3e289b797acc397':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:54:50 +0000 (17:54 +0000)]
am
6db29a92: am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
6db29a92452c2a837528d20d024dcacefd450c17':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Alex Klyubin [Tue, 21 Apr 2015 22:17:24 +0000 (15:17 -0700)]
No runtime exceptions during normal use of AndroidKeyStore crypto.
This changes the implementation of AndroidKeyStore-backed Cipher and
Mac to avoid throwing runtime exceptions during normal use. Runtime
exceptions will now be thrown only due to truly exceptional and
unrecoverable errors (e.g., keystore unreachable, or crypto primitive
not initialized).
This also changes the implementation of Cipher to cache any errors
encountered in Cipher.update until Cipher.doFinal which then throws
them as checked exceptions.
Bug:
20525947
Change-Id: I3c4ad57fe70abfbb817a79402f722a0208660727
Alex Klyubin [Fri, 24 Apr 2015 17:52:35 +0000 (17:52 +0000)]
Merge "Reset AndroidKeyStore Mac and Cipher state when init fails."
Scott Rowe [Fri, 24 Apr 2015 17:49:13 +0000 (17:49 +0000)]
Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
Alex Klyubin [Fri, 24 Apr 2015 17:47:17 +0000 (10:47 -0700)]
Reset AndroidKeyStore Mac and Cipher state when init fails.
For consistency, this also switches AndroidKeyStore's Mac init/reset
implementation to the same approach as used in Cipher.
Bug:
18088752
Change-Id: Id34caf7cfe04f2058e22d8632890f762927bb31c
Leon Scroggins III [Fri, 24 Apr 2015 17:43:38 +0000 (17:43 +0000)]
am
b3523d7f: am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
b3523d7f8f8274a04145ca34eab9821aafb52d7a':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:43:23 +0000 (17:43 +0000)]
am
f828f43f: am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
f828f43f97f4a018e2224e926b900713081a8c5b':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Olawale Ogunwale [Fri, 24 Apr 2015 17:42:58 +0000 (17:42 +0000)]
Merge "[ActivityManager] Avoid orphan ContentProviderRecord."
Mark Renouf [Fri, 24 Apr 2015 17:42:01 +0000 (17:42 +0000)]
am
99d49300: am
55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '
99d4930064e7d155ce92746028cbafd46b14c6f4':
Fixes rejected dismiss gestures (framework version of ag/677161)
Leon Scroggins III [Fri, 24 Apr 2015 17:33:04 +0000 (17:33 +0000)]
am
41c458c8: am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
41c458c81125fb6e3fc9eb5304f0d3216a0a2d74':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:32:59 +0000 (17:32 +0000)]
am
38cf068c: am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
38cf068c04e1ce244529b95f6cc6d7d6a88fab24':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Mark Renouf [Fri, 24 Apr 2015 17:31:31 +0000 (17:31 +0000)]
am
55555a3d: Fixes rejected dismiss gestures (framework version of ag/677161)
* commit '
55555a3dab1f3b99a3299b90851624e9dc10f3cc':
Fixes rejected dismiss gestures (framework version of ag/677161)
Quddus Chong [Fri, 24 Apr 2015 17:07:36 +0000 (10:07 -0700)]
docs: Updated What's New for GMS v7.3 to remove Maps support for Wear.
Change-Id: I8ebe6c77c4eac3ac660f148bf40ce9a1f710e5fb
Leon Scroggins III [Fri, 24 Apr 2015 17:15:55 +0000 (17:15 +0000)]
am
67326bcb: am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
67326bcba0f7287367dedba4caaf2a168a43f057':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Fri, 24 Apr 2015 17:15:43 +0000 (17:15 +0000)]
am
16ac8ad7: am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
16ac8ad7fac73524b5296f955884bd2aec405ded':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Adam Langley [Fri, 24 Apr 2015 16:59:35 +0000 (09:59 -0700)]
frameworks/base: switch to using NativeConstants.
NativeCrypto is a conscrypt class that contained several OpenSSL
constants. NativeConstants is the new class that contains the same
thing, but the latter is automatically generated and thus won't drift
from the C headers.
Bug:
20521989
Change-Id: I45c7b9a6844a06e3ffd09be692ebf733e1ebbbcc
Mark Renouf [Fri, 24 Apr 2015 15:47:27 +0000 (11:47 -0400)]
Fixes rejected dismiss gestures (framework version of ag/677161)
Gus's original change description:
This change modifies the logic in SwipeDismissLayout which determines
whether or not a gesture should be interpreted as a dismiss
gesture.
Previously, on the first touch move event, the gesture was classified
as a dismiss gesture if the X movement exceeded the touch slop
and the Y movement did not. At this point the gesture was not
intercepted and the underlying widget (in the case of the cue
card, the GridViewPager) received all subsequent move events.
In the case of a very fast gesture at a slight vertical angle, it was
easy for the total Y movement to exceed the touch slop.
This change only rejects the gesture if the Y movement exceeds
the X movement, which is consistent with how GridViewPager
distinguishes horizontal vs. vertical swipes.
This change also cancels the dismissal if the end of the gesture
is a leftwards flight.
BUG:
20542762
(Same as b/
20350515 but for Activity dismissal at the system level.)
Change-Id: I6e3fb646c42dda0d1c1f5552d91b27c6374fc08c
Neil Fuller [Fri, 24 Apr 2015 11:01:29 +0000 (11:01 +0000)]
am
ff1e7e01: am
0e29681f: Merge "Load ICU4J data on boot"
* commit '
ff1e7e01f16173ae0ea1bd9e6738ff7b5ce33add':
Load ICU4J data on boot
Neil Fuller [Fri, 24 Apr 2015 10:50:52 +0000 (10:50 +0000)]
am
0e29681f: Merge "Load ICU4J data on boot"
* commit '
0e29681f98dad8df9f772d86a848190138245f3d':
Load ICU4J data on boot
Neil Fuller [Fri, 24 Apr 2015 10:30:16 +0000 (10:30 +0000)]
Merge "Load ICU4J data on boot"
Andrew Solovay [Thu, 23 Apr 2015 22:19:40 +0000 (22:19 +0000)]
am
090df87d: am
4dde4c9e: am
e45e41d7: am
44fa5e71: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
090df87d7e3ed91b4bfe659fd0a41fed86cb68a7':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Thu, 23 Apr 2015 22:19:33 +0000 (22:19 +0000)]
am
8aff67ec: am
dad05551: am
24ccb900: am
7a866a88: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
8aff67ec367e43c089080fcb3f4e73ac7ac7aaf1':
docs: Update to doc on listening for restrictions-changed intent
Svet Ganov [Thu, 23 Apr 2015 22:19:04 +0000 (22:19 +0000)]
am
f33489c6: am
d24cc193: am
db672b6c: am
00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit '
f33489c6bda49cf930cb06601625ddf792d41fe7':
DO NOT MERGE Don't take flags when creating app widget config activity.
Quddus Chong [Thu, 23 Apr 2015 21:29:34 +0000 (14:29 -0700)]
resolved conflicts for merge of
e470fd85 to lmp-mr1-ub-dev
Change-Id: I9ecfa4b7b225f2543bdbdad0f046e9474f1cb47f
Andrew Solovay [Thu, 23 Apr 2015 20:53:23 +0000 (20:53 +0000)]
am
4dde4c9e: am
e45e41d7: am
44fa5e71: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
4dde4c9e723826fae1275c6537d2d5a615b3a0ae':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Thu, 23 Apr 2015 20:41:14 +0000 (20:41 +0000)]
am
e45e41d7: am
44fa5e71: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
e45e41d7fa6c88cf74be31a509003b8f9e7fa7b1':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Thu, 23 Apr 2015 20:36:42 +0000 (20:36 +0000)]
am
f9787d87: Merge "cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26" into lmp-mr1-ub-docs
* commit '
f9787d87e03987561f13888b912f96b2e473b674':
cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26
Andrew Solovay [Thu, 23 Apr 2015 20:29:42 +0000 (20:29 +0000)]
am
44fa5e71: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
44fa5e71ab709c83af387958598f551583d6dbb0':
Docs: Correcting section on how to escape quotes in strings.
Andrew Solovay [Thu, 23 Apr 2015 20:25:34 +0000 (20:25 +0000)]
Merge "cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26" into lmp-mr1-ub-docs
Andrew Solovay [Thu, 23 Apr 2015 20:18:51 +0000 (20:18 +0000)]
am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
5b3152cffcd90441ca4cacdf5596e9bb3428af08':
Docs: Correcting section on how to escape quotes in strings.
Quddus Chong [Thu, 23 Apr 2015 20:11:47 +0000 (20:11 +0000)]
am
79918589: docs: Fixed url for Wear sample on \'What\'s New for GMS v7.3\'.
* commit '
79918589e18c73d63c08b9688bfb2cf6af0aa0df':
docs: Fixed url for Wear sample on 'What's New for GMS v7.3'.
Andrew Solovay [Thu, 2 Apr 2015 22:10:51 +0000 (15:10 -0700)]
cherrypick from lmp-docs Docs: Correcting how to escape quotes.
Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26
The behavior for single and double-quotes is different--I expanded
this section to note how they differ.
bug:
19959941
Change-Id: I9be9c066c416e9403a3ac164af0b1ce35f7ab1dd
Andrew Solovay [Thu, 23 Apr 2015 20:06:29 +0000 (20:06 +0000)]
Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
Quddus Chong [Thu, 23 Apr 2015 19:27:10 +0000 (12:27 -0700)]
docs: Fixed url for Wear sample on 'What's New for GMS v7.3'.
Change-Id: I42a9e28e40fe54aff1f1882265e4e472fa9cf9a0
Andrew Solovay [Thu, 23 Apr 2015 19:09:28 +0000 (19:09 +0000)]
am
dad05551: am
24ccb900: am
7a866a88: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
dad055518f3416d2c212230343cb8f9433e395a2':
docs: Update to doc on listening for restrictions-changed intent
Andrew Solovay [Thu, 23 Apr 2015 18:56:26 +0000 (18:56 +0000)]
am
24ccb900: am
7a866a88: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
24ccb900258443bff7d943ad0d4fe1ff1f6f0ba4':
docs: Update to doc on listening for restrictions-changed intent
Andrew Solovay [Thu, 23 Apr 2015 18:50:04 +0000 (18:50 +0000)]
am
26a8090a: cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d
* commit '
26a8090a09bce05398cc52581ea4a5cf05d28d59':
cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d
Andrew Solovay [Thu, 23 Apr 2015 18:44:24 +0000 (18:44 +0000)]
am
7a866a88: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
7a866a88318f6a44f316dc18e0472f39a289fee6':
docs: Update to doc on listening for restrictions-changed intent
Andrew Solovay [Fri, 20 Mar 2015 18:44:33 +0000 (11:44 -0700)]
cherrypick from lmp-docs docs: Listening for restrictions-changed
Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d
Per bug
19848206, it turns out that APPLICATION_RESTRICTIONS_CHANGED
is only sent to dynamically-declared listeners, *not* to listeners
declared in the manifest. Updated doc to note this. (The code snippet
already showed how to dynamically declare a listener.)
See first comment for doc stage location.
bug:
19848206
Change-Id: I6dc5f39dc6eed71cf2e303564ea906be3832d8a4
Andrew Solovay [Thu, 23 Apr 2015 18:31:59 +0000 (18:31 +0000)]
am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
09cf4d500dd27342c913d2333f4f0fd2fa9dbfd0':
docs: Update to doc on listening for restrictions-changed intent
Andrew Solovay [Thu, 23 Apr 2015 18:20:06 +0000 (18:20 +0000)]
Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
Joe Fernandez [Thu, 23 Apr 2015 17:45:19 +0000 (17:45 +0000)]
am
92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs
* commit '
92ae292e864287abcb1a78c117263f64b303b885':
docs: Add text to JavaDocs regarding browser file access vulnerability
Joe Fernandez [Thu, 23 Apr 2015 17:33:17 +0000 (17:33 +0000)]
Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs
Leon Scroggins III [Thu, 23 Apr 2015 16:41:49 +0000 (16:41 +0000)]
am
ea2dcda7: am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
ea2dcda788e035ccdc55ab16303c9e34740a3f8c':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 16:29:22 +0000 (16:29 +0000)]
am
ee35410f: (-s ours) am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
ee35410ff8297b1ab39f3e546ebcedc27300a7de':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 16:20:02 +0000 (16:20 +0000)]
am
a7501119: am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
a7501119e341626536ce12c3539c2f9a986a2945':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 15:53:24 +0000 (15:53 +0000)]
am
4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
4a6ca6724c789603626d74a8cc187365788a6cfd':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Thu, 23 Apr 2015 15:48:12 +0000 (15:48 +0000)]
am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
69b8e962e1b8346b33a2c14889547a0ac00c8b17':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Svet Ganov [Thu, 23 Apr 2015 15:43:01 +0000 (15:43 +0000)]
am
d24cc193: am
db672b6c: am
00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit '
d24cc19343073294b3376f825bdc0d54a8d692f1':
DO NOT MERGE Don't take flags when creating app widget config activity.
Svet Ganov [Thu, 23 Apr 2015 15:30:43 +0000 (15:30 +0000)]
am
db672b6c: am
00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit '
db672b6cde256e27c1188c7e99f23e5a65252ba4':
DO NOT MERGE Don't take flags when creating app widget config activity.
Svet Ganov [Thu, 23 Apr 2015 15:18:10 +0000 (15:18 +0000)]
am
00e91901: Merge "DO NOT MERGE Don\'t take flags when creating app widget config activity." into lmp-mr1-dev
* commit '
00e91901fd1dd007de196ada04e3fc2f79e1be73':
DO NOT MERGE Don't take flags when creating app widget config activity.
Svet Ganov [Thu, 23 Apr 2015 15:09:46 +0000 (15:09 +0000)]
Merge "DO NOT MERGE Don't take flags when creating app widget config activity." into lmp-mr1-dev
Neil Fuller [Thu, 23 Apr 2015 13:50:34 +0000 (14:50 +0100)]
Load ICU4J data on boot
Bug:
20252074
Bug:
20396452
Change-Id: I17de761e0d81caa2fc280b5cc368ee6113a5d655
Quddus Chong [Thu, 23 Apr 2015 04:55:40 +0000 (04:55 +0000)]
am
d6588e35: am
918b71ca: am
a5cca430: am
7a8b0945: am
789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
d6588e3575eb2b2e00571c814fd418b5f061cd20':
docs: Added What's New section for GMS v7.3 (Parmesan).
Luan Nguyen [Thu, 23 Apr 2015 04:55:35 +0000 (04:55 +0000)]
am
a5bc07e0: am
8cc54aa3: am
4b76e896: am
1cc56633: am
33ac358a: docs: Add Wear Capability training
* commit '
a5bc07e0440c4409d52311be4300ba44b00351a1':
docs: Add Wear Capability training
Quddus Chong [Thu, 23 Apr 2015 04:43:41 +0000 (04:43 +0000)]
am
d80f4fc8: am
04002800: am
d57ccb8d: am
f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
d80f4fc80a132b40ace7ba2b51eb784d73443004':
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Thu, 23 Apr 2015 04:43:35 +0000 (04:43 +0000)]
am
918b71ca: am
a5cca430: am
7a8b0945: am
789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
918b71ca319373c0025c2ddf0168877c7bc8d306':
docs: Added What's New section for GMS v7.3 (Parmesan).
Luan Nguyen [Thu, 23 Apr 2015 04:43:29 +0000 (04:43 +0000)]
am
8cc54aa3: am
4b76e896: am
1cc56633: am
33ac358a: docs: Add Wear Capability training
* commit '
8cc54aa311daf3aca1a0c793eee268bfb4d5b149':
docs: Add Wear Capability training
Quddus Chong [Thu, 23 Apr 2015 03:40:29 +0000 (03:40 +0000)]
am
04002800: am
d57ccb8d: am
f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
040028000c0769606cbd5a9265f385e68c15433c':
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Thu, 23 Apr 2015 03:40:22 +0000 (03:40 +0000)]
am
a5cca430: am
7a8b0945: am
789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
a5cca4303616e86242b4d5c5f09edbb5668e7f6b':
docs: Added What's New section for GMS v7.3 (Parmesan).
Luan Nguyen [Thu, 23 Apr 2015 03:39:53 +0000 (03:39 +0000)]
am
4b76e896: am
1cc56633: am
33ac358a: docs: Add Wear Capability training
* commit '
4b76e8967cd435c2d0b01f2b9a2f11a9a4bc547e':
docs: Add Wear Capability training
Rich Slogar [Thu, 23 Apr 2015 00:50:12 +0000 (00:50 +0000)]
am
674b0648: Merge "docs: support library 22.1 feature updates" into lmp-mr1-ub-docs
* commit '
674b06481dc73ce64116b885eb97266f956b614d':
docs: support library 22.1 feature updates
Rich Slogar [Thu, 23 Apr 2015 00:43:48 +0000 (00:43 +0000)]
Merge "docs: support library 22.1 feature updates" into lmp-mr1-ub-docs
Joe Fernandez [Thu, 23 Apr 2015 00:29:12 +0000 (17:29 -0700)]
docs: Add text to JavaDocs regarding browser file access vulnerability
b/
17420682
Change-Id: Ic03b51778280570be65ae933fd906b140acdf023
Quddus Chong [Thu, 23 Apr 2015 00:01:07 +0000 (00:01 +0000)]
am
d57ccb8d: am
f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
d57ccb8d3c814ea46d735d7443e02e669207afef':
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Thu, 23 Apr 2015 00:01:03 +0000 (00:01 +0000)]
am
7a8b0945: am
789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
7a8b094521832586b142de34c91ab2c886eb5109':
docs: Added What's New section for GMS v7.3 (Parmesan).
Quddus Chong [Wed, 22 Apr 2015 23:55:30 +0000 (23:55 +0000)]
am
7570ef70: cherrypick from lmp-docs branch. docs: Added What\'s New section for GMS v7.3 (Parmesan). Original change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
* commit '
7570ef70f33d9267e722063e9de21e84d6ba2b29':
cherrypick from lmp-docs branch. docs: Added What's New section for GMS v7.3 (Parmesan). Original change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
Quddus Chong [Wed, 22 Apr 2015 23:55:25 +0000 (23:55 +0000)]
am
a93259a4: cherrypick from lmp-docs. docs: Added 3rd-party Javadocs for GMS Parmesan release. Original change-Id: Ia133c7267e500969310524369d34ab07c6aaa854
* commit '
a93259a4d6ab5c3f003322bfe72cac462fb5d77a':
cherrypick from lmp-docs. docs: Added 3rd-party Javadocs for GMS Parmesan release. Original change-Id: Ia133c7267e500969310524369d34ab07c6aaa854
Yang Ni [Wed, 22 Apr 2015 23:48:23 +0000 (23:48 +0000)]
am
869b428b: am
f5fa550a: Merge "Move new script group API into ScriptGroup class"
* commit '
869b428b29651934c1e99d71fdc715d3c482a522':
Move new script group API into ScriptGroup class
Quddus Chong [Wed, 22 Apr 2015 23:48:00 +0000 (23:48 +0000)]
am
f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
f0936e2fb0e9f013f6079e7a733a41d42d49c3f3':
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Quddus Chong [Wed, 22 Apr 2015 23:47:55 +0000 (23:47 +0000)]
am
789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
* commit '
789c59711e55be981ed2093228ded0c588e74ba0':
docs: Added What's New section for GMS v7.3 (Parmesan).
Quddus Chong [Thu, 16 Apr 2015 16:07:28 +0000 (09:07 -0700)]
cherrypick from lmp-docs branch. docs: Added What's New
section for GMS v7.3 (Parmesan). Original change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
Change-Id: I6d9583fb8c301ee16ff65d4db56e79547ea5e88b
Quddus Chong [Mon, 13 Apr 2015 22:16:55 +0000 (15:16 -0700)]
cherrypick from lmp-docs. docs: Added 3rd-party Javadocs for GMS
Parmesan release. Original change-Id: Ia133c7267e500969310524369d34ab07c6aaa854
Change-Id: I07f38278510e92bc3097ea749c7fb4e6b817f545
Quddus Chong [Wed, 22 Apr 2015 23:38:20 +0000 (23:38 +0000)]
Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
OSDN Git Service
