Andrew Solovay
090df87d7e
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.
2015-04-23 20:53:23 +00:00
Andrew Solovay
4dde4c9e72
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.
2015-04-23 20:41:14 +00:00
Andrew Solovay
e45e41d7fa
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.
2015-04-23 20:29:42 +00:00
Andrew Solovay
44fa5e71ab
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.
2015-04-23 20:18:51 +00:00
Andrew Solovay
5b3152cffc
Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
2015-04-23 20:06:34 +00:00
Andrew Solovay
8aff67ec36
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
2015-04-23 19:09:28 +00:00
Andrew Solovay
dad055518f
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
2015-04-23 18:56:26 +00:00
Andrew Solovay
24ccb90025
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
2015-04-23 18:44:24 +00:00
Andrew Solovay
7a866a8831
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
2015-04-23 18:31:59 +00:00
Andrew Solovay
09cf4d500d
Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
2015-04-23 18:20:07 +00:00
Svet Ganov
f33489c6bd
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.
2015-04-23 15:43:01 +00:00
Svet Ganov
d24cc19343
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.
2015-04-23 15:30:43 +00:00
Svet Ganov
db672b6cde
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.
2015-04-23 15:18:10 +00:00
Svet Ganov
00e91901fd
Merge "DO NOT MERGE Don't take flags when creating app widget config activity." into lmp-mr1-dev
2015-04-23 15:09:48 +00:00
Quddus Chong
e470fd855c
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.
2015-04-23 04:43:41 +00:00
Quddus Chong
d6588e3575
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).
2015-04-23 04:43:35 +00:00
Luan Nguyen
a5bc07e044
am 8cc54aa3: am 4b76e896: am 1cc56633: am 33ac358a: docs: Add Wear Capability training
...
* commit '8cc54aa311daf3aca1a0c793eee268bfb4d5b149':
docs: Add Wear Capability training
2015-04-23 04:43:29 +00:00
Quddus Chong
d80f4fc80a
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.
2015-04-23 03:40:29 +00:00
Quddus Chong
918b71ca31
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).
2015-04-23 03:40:22 +00:00
Luan Nguyen
8cc54aa311
am 4b76e896: am 1cc56633: am 33ac358a: docs: Add Wear Capability training
...
* commit '4b76e8967cd435c2d0b01f2b9a2f11a9a4bc547e':
docs: Add Wear Capability training
2015-04-23 03:39:53 +00:00
Quddus Chong
040028000c
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.
2015-04-23 00:01:07 +00:00
Quddus Chong
a5cca43036
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).
2015-04-23 00:01:03 +00:00
Quddus Chong
d57ccb8d3c
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.
2015-04-22 23:48:00 +00:00
Quddus Chong
7a8b094521
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).
2015-04-22 23:47:55 +00:00
Quddus Chong
f0936e2fb0
Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
2015-04-22 23:38:38 +00:00
Quddus Chong
789c59711e
Merge "docs: Added What's New section for GMS v7.3 (Parmesan)." into lmp-docs
2015-04-22 23:37:33 +00:00
Yang Ni
869b428b29
am f5fa550a: Merge "Move new script group API into ScriptGroup class"
...
* commit 'f5fa550afafa2276abce78b3e5779ce11dc16c68':
Move new script group API into ScriptGroup class
2015-04-22 23:37:06 +00:00
Yang Ni
f5fa550afa
Merge "Move new script group API into ScriptGroup class"
2015-04-22 23:14:38 +00:00
Yang Ni
ead1af8319
Move new script group API into ScriptGroup class
...
And mark existing methods and builder deprecated.
Removed ScriptGroup2 class.
Renamed nested class UnboundValue to Input.
Marked classes Closure, Future, and Input as final.
Change-Id: I362910c115e9d0173dc515674e08bf4878232879
2015-04-22 15:34:07 -07:00
Quddus Chong
cfdcf7d6d8
docs: Added What's New section for GMS v7.3 (Parmesan).
...
Change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
2015-04-22 14:56:37 -07:00
Marco Nelissen
3430f59951
am ba43f7e9: Merge "Revert "Sometimes the application context is null""
...
* commit 'ba43f7e914cd2cb8145ffeb5720aa5e87be48b9b':
Revert "Sometimes the application context is null"
2015-04-22 20:28:54 +00:00
Marco Nelissen
ba43f7e914
Merge "Revert "Sometimes the application context is null""
2015-04-22 20:08:38 +00:00
Marco Nelissen
360f2ab62d
Revert "Sometimes the application context is null"
...
This reverts commit d86281cb3d .
Change-Id: Icaf8e1e4812f64060066331f9000be15c134d1d2
2015-04-22 20:07:15 +00:00
Marco Nelissen
9e05ece7ab
am 0601a280: Merge "Sometimes the application context is null"
...
* commit '0601a280e5db18ff2c084a0785504f959c2ff92f':
Sometimes the application context is null
2015-04-22 19:31:26 +00:00
Marco Nelissen
0601a280e5
Merge "Sometimes the application context is null"
2015-04-22 19:06:47 +00:00
Justin Koh
ba75135a80
am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev
...
* commit '2aa3905cb0cc595783ab43b0bc7a4b3818003958':
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
2015-04-22 00:43:16 +00:00
ztenghui
059451e185
am 23606598: DO NOT MERGE: Reset the Node status when clone.
...
* commit '23606598244c2a297d994895eaf631b240d33242':
DO NOT MERGE: Reset the Node status when clone.
2015-04-22 00:43:08 +00:00
Justin Koh
2aa3905cb0
Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev
2015-04-22 00:31:00 +00:00
Andreas Gampe
fb861b6c8d
am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
...
* commit '31fb202e6f6687f86ec4fc33b18aafacbf67c797':
Frameworks/base: Compile-time optimize SQLiteConnection
2015-04-21 23:59:57 +00:00
Andreas Gampe
31fb202e6f
Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
2015-04-21 23:31:51 +00:00
Mathieu Chartier
765d7c3048
am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
...
* commit 'ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
Update getExportedPropertyMethods to new reflection API
2015-04-21 23:26:49 +00:00
Andreas Gampe
c7f9f7656f
am 189d2785: Merge "Frameworks/base: Fix comment"
...
* commit '189d2785c3b71eac9c122c874586501a2ab723b2':
Frameworks/base: Fix comment
2015-04-21 23:26:41 +00:00
Mathieu Chartier
ba6783b69a
Merge "Update getExportedPropertyMethods to new reflection API"
2015-04-21 23:03:35 +00:00
Andreas Gampe
4f47b40e05
Frameworks/base: Compile-time optimize SQLiteConnection
...
Do not cache compiled regular expression and date formatter. Both
cannot be compile-time created, are expensive at preloading time,
and only used in the rare case of dumping the connection (mainly
on errors).
Bug: 19498458
Bug: 19542228
Change-Id: Ia38491a3f852ccf699b815ff05289b338e932f2a
2015-04-21 16:01:00 -07:00
Luan Nguyen
4b76e8967c
am 1cc56633: am 33ac358a: docs: Add Wear Capability training
...
* commit '1cc5663357def0221b46f86e6295ea01c40be2a1':
docs: Add Wear Capability training
2015-04-21 22:54:59 +00:00
Luan Nguyen
1cc5663357
am 33ac358a: docs: Add Wear Capability training
...
* commit '33ac358a5a4199549d11ba1931243e7dc8a7ab85':
docs: Add Wear Capability training
2015-04-21 22:40:59 +00:00
ztenghui
612e5cdec6
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
...
b/20119270
Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
(cherry picked from commit 26e9a19900 )
2015-04-21 21:26:53 +00:00
ztenghui
2360659824
DO NOT MERGE: Reset the Node status when clone.
...
b/20457797
Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
2015-04-21 20:31:58 +00:00
Mathieu Chartier
a8a6516f62
Update getExportedPropertyMethods to new reflection API
...
Bug: 19264997
Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
2015-04-21 11:52:10 -07:00
Andreas Gampe
189d2785c3
Merge "Frameworks/base: Fix comment"
2015-04-21 16:10:28 +00:00