OSDN Git Service
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: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: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.
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
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: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 [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
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
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
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: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 [Wed, 22 Apr 2015 23:38:20 +0000 (23:38 +0000)]
Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
Quddus Chong [Wed, 22 Apr 2015 23:37:32 +0000 (23:37 +0000)]
Merge "docs: Added What's New section for GMS v7.3 (Parmesan)." into lmp-docs
Yang Ni [Wed, 22 Apr 2015 23:37:06 +0000 (23:37 +0000)]
am
f5fa550a: Merge "Move new script group API into ScriptGroup class"
* commit '
f5fa550afafa2276abce78b3e5779ce11dc16c68':
Move new script group API into ScriptGroup class
Yang Ni [Wed, 22 Apr 2015 23:14:34 +0000 (23:14 +0000)]
Merge "Move new script group API into ScriptGroup class"
Yang Ni [Fri, 17 Apr 2015 23:51:55 +0000 (16:51 -0700)]
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
Quddus Chong [Thu, 16 Apr 2015 16:07:28 +0000 (09:07 -0700)]
docs: Added What's New section for GMS v7.3 (Parmesan).
Change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
Marco Nelissen [Wed, 22 Apr 2015 20:28:54 +0000 (20:28 +0000)]
am
ba43f7e9: Merge "Revert "Sometimes the application context is null""
* commit '
ba43f7e914cd2cb8145ffeb5720aa5e87be48b9b':
Revert "Sometimes the application context is null"
Marco Nelissen [Wed, 22 Apr 2015 20:08:36 +0000 (20:08 +0000)]
Merge "Revert "Sometimes the application context is null""
Marco Nelissen [Wed, 22 Apr 2015 20:07:15 +0000 (20:07 +0000)]
Revert "Sometimes the application context is null"
This reverts commit
d86281cb3da685672d89f964228980f6753adcae.
Change-Id: Icaf8e1e4812f64060066331f9000be15c134d1d2
Marco Nelissen [Wed, 22 Apr 2015 19:31:26 +0000 (19:31 +0000)]
am
0601a280: Merge "Sometimes the application context is null"
* commit '
0601a280e5db18ff2c084a0785504f959c2ff92f':
Sometimes the application context is null
Marco Nelissen [Wed, 22 Apr 2015 19:06:36 +0000 (19:06 +0000)]
Merge "Sometimes the application context is null"
Justin Koh [Wed, 22 Apr 2015 00:43:16 +0000 (00:43 +0000)]
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.
ztenghui [Wed, 22 Apr 2015 00:43:08 +0000 (00:43 +0000)]
am
23606598: DO NOT MERGE: Reset the Node status when clone.
* commit '
23606598244c2a297d994895eaf631b240d33242':
DO NOT MERGE: Reset the Node status when clone.
Justin Koh [Wed, 22 Apr 2015 00:30:59 +0000 (00:30 +0000)]
Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev
Andreas Gampe [Tue, 21 Apr 2015 23:59:57 +0000 (23:59 +0000)]
am
31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
* commit '
31fb202e6f6687f86ec4fc33b18aafacbf67c797':
Frameworks/base: Compile-time optimize SQLiteConnection
Andreas Gampe [Tue, 21 Apr 2015 23:31:51 +0000 (23:31 +0000)]
Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
Mathieu Chartier [Tue, 21 Apr 2015 23:26:49 +0000 (23:26 +0000)]
am
ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
* commit '
ba6783b69a34b05123d1e3da51e6a11a9e0ca115':
Update getExportedPropertyMethods to new reflection API
Andreas Gampe [Tue, 21 Apr 2015 23:26:41 +0000 (23:26 +0000)]
am
189d2785: Merge "Frameworks/base: Fix comment"
* commit '
189d2785c3b71eac9c122c874586501a2ab723b2':
Frameworks/base: Fix comment
Mathieu Chartier [Tue, 21 Apr 2015 23:03:33 +0000 (23:03 +0000)]
Merge "Update getExportedPropertyMethods to new reflection API"
Andreas Gampe [Mon, 20 Apr 2015 22:29:04 +0000 (15:29 -0700)]
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
Luan Nguyen [Tue, 21 Apr 2015 22:54:59 +0000 (22:54 +0000)]
am
1cc56633: am
33ac358a: docs: Add Wear Capability training
* commit '
1cc5663357def0221b46f86e6295ea01c40be2a1':
docs: Add Wear Capability training
Luan Nguyen [Tue, 21 Apr 2015 22:40:59 +0000 (22:40 +0000)]
am
33ac358a: docs: Add Wear Capability training
* commit '
33ac358a5a4199549d11ba1931243e7dc8a7ab85':
docs: Add Wear Capability training
ztenghui [Fri, 10 Apr 2015 20:14:17 +0000 (13:14 -0700)]
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
b/
20119270
Change-Id: I26365b38e4a9712227aaec6f08f32025dab82ac7
(cherry picked from commit
26e9a19900bae56b012425a114685d42dfa2fde1)
ztenghui [Tue, 21 Apr 2015 20:00:08 +0000 (13:00 -0700)]
DO NOT MERGE: Reset the Node status when clone.
b/
20457797
Change-Id: I5f1b0e2238fdc4a69a9c09c1e6e0272f7ede3685
Mathieu Chartier [Fri, 17 Apr 2015 19:49:57 +0000 (12:49 -0700)]
Update getExportedPropertyMethods to new reflection API
Bug:
19264997
Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
Andreas Gampe [Tue, 21 Apr 2015 16:10:26 +0000 (16:10 +0000)]
Merge "Frameworks/base: Fix comment"
Andreas Gampe [Tue, 21 Apr 2015 16:01:51 +0000 (09:01 -0700)]
Frameworks/base: Fix comment
Fix comment in ZygoteInit.
Change-Id: I853581c8d44ee52ee8e113c67ea68621643ecb39
Olawale Ogunwale [Tue, 21 Apr 2015 15:53:53 +0000 (15:53 +0000)]
am
fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
* commit '
fa147b5caf7b44f76aee515afecda639fbc52c22':
[ActivityManager] Move UI operation to UI handler
Olawale Ogunwale [Tue, 21 Apr 2015 15:53:45 +0000 (15:53 +0000)]
am
0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"
* commit '
0408187e7d2e7bdb6d0cb0521f49859a3d9a7396':
[ActivityManager] Avoid unnecessary restart provider process
Luan Nguyen [Tue, 21 Apr 2015 15:35:41 +0000 (15:35 +0000)]
am
2fdd83a9: am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
2fdd83a97a0dd3de36264928ff42dcc0a098018f':
docs: Add Channel API summary for Wear.
Olawale Ogunwale [Tue, 21 Apr 2015 15:31:58 +0000 (15:31 +0000)]
Merge "[ActivityManager] Move UI operation to UI handler"
riddle_hsu [Thu, 16 Apr 2015 04:45:48 +0000 (12:45 +0800)]
[ActivityManager] Move UI operation to UI handler
Because ANR will dump cpu usage, stack traces in ActivityManager
thread, if system is busy or in low-end device, it may spend more
than 5s to dump. So when there is UI operation (e.g. pop dialog)
in ActivityManager thread, it may meet key dispatch timeout.
Change-Id: Ie550e31a7cff65bdcfc9af2c32989e9deb5fb2cf
Olawale Ogunwale [Tue, 21 Apr 2015 15:29:09 +0000 (15:29 +0000)]
Merge "[ActivityManager] Avoid unnecessary restart provider process"
Marco Nelissen [Fri, 17 Apr 2015 16:50:56 +0000 (09:50 -0700)]
Sometimes the application context is null
when called from systemui.
Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: Ic7b98e39fd9ad2436b855cf9f7f53d3e7a1948c0
Luan Nguyen [Tue, 14 Apr 2015 15:54:22 +0000 (08:54 -0700)]
docs: Add Wear Capability training
bug:
20088602
Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0
Luan Nguyen [Tue, 21 Apr 2015 15:24:36 +0000 (15:24 +0000)]
am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
d2545775568694c75c9589eaf7c894583e37de4e':
docs: Add Channel API summary for Wear.
Craig Mautner [Tue, 21 Apr 2015 15:19:06 +0000 (15:19 +0000)]
am
80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit '
80f99121ea96cdabea6260ab165e7183431be513':
Prevent infinite layout and wallpaper flashing
Luan Nguyen [Tue, 21 Apr 2015 15:12:51 +0000 (15:12 +0000)]
am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
4c20df0bbec2774e8829245547cfe8a42c5faea7':
docs: Add Channel API summary for Wear.
Luan Nguyen [Tue, 21 Apr 2015 15:00:56 +0000 (15:00 +0000)]
am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
4aebbfbb9ba54d77ac99508fb66db6c9fd24343a':
docs: Add Channel API summary for Wear.
Craig Mautner [Tue, 21 Apr 2015 14:54:42 +0000 (14:54 +0000)]
Merge "Prevent infinite layout and wallpaper flashing"
Luan Nguyen [Tue, 21 Apr 2015 14:53:02 +0000 (14:53 +0000)]
Merge "docs: Add Channel API summary for Wear." into lmp-docs
Andreas Gampe [Tue, 21 Apr 2015 04:26:53 +0000 (04:26 +0000)]
am
b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
* commit '
b6feabcfce080c2dc906434cf05ff606489cf39d':
Frameworks/base: Use better Class.forName in ZygoteInit
Andreas Gampe [Tue, 21 Apr 2015 04:01:59 +0000 (04:01 +0000)]
Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
Andreas Gampe [Tue, 21 Apr 2015 02:16:37 +0000 (19:16 -0700)]
Frameworks/base: Use better Class.forName in ZygoteInit
Use the three-argument version of Class.forName. This saves an
expensive stack lookup for the caller's class-loader on each
invocation.
Bug:
19498458
Change-Id: I859affde31e580fd2de3f70ee0a9295936c2d9f4
Quddus Chong [Mon, 20 Apr 2015 23:29:30 +0000 (23:29 +0000)]
am
b1c838e0: am
6f142008: am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
b1c838e03bf9f828e59deed57a7e7445cc2ad9e8':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Mon, 20 Apr 2015 23:15:17 +0000 (23:15 +0000)]
am
6f142008: am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
6f14200880a79a9813f3448c15fe7097c3b7733b':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Mon, 20 Apr 2015 23:03:32 +0000 (23:03 +0000)]
am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
220f360e02ae833fcadc342756932f76f6780626':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Mon, 20 Apr 2015 22:51:40 +0000 (22:51 +0000)]
am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
900831f303beb4a67a871d969ac822d8b6d36460':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
Quddus Chong [Fri, 17 Apr 2015 22:01:16 +0000 (15:01 -0700)]
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2.
bug:
20304402
Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
Alex Klyubin [Mon, 20 Apr 2015 18:34:05 +0000 (18:34 +0000)]
am
c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
* commit '
c77c14c23d5617b7e4d69dccff890f3b1b55b567':
Make MediaPlayer fail fast on UnknownServiceException.
Quddus Chong [Mon, 13 Apr 2015 22:16:55 +0000 (15:16 -0700)]
docs: Added 3rd-party Javadocs for GMS Parmesan release.
Change-Id: Ia133c7267e500969310524369d34ab07c6aaa854
Alex Klyubin [Mon, 20 Apr 2015 17:54:14 +0000 (17:54 +0000)]
Merge "Make MediaPlayer fail fast on UnknownServiceException."
Svet Ganov [Mon, 20 Apr 2015 15:28:30 +0000 (08:28 -0700)]
DO NOT MERGE Don't take flags when creating app widget config activity.
bug:
19618745
Change-Id: I7973ebfc67ebf52f14890dda9eb891a7b8a5a095
Alex Klyubin [Mon, 20 Apr 2015 17:11:57 +0000 (10:11 -0700)]
Make MediaPlayer fail fast on UnknownServiceException.
This makes MediaPlayer's network streaming code fail fast when an
UnknownServiceException is encountered. This currently occurs when the
application declares that it does not perform cleartext network
traffic and tries to load media over cleartext HTTP. Without this CL,
MediaPlayer blocks for 30 seconds because it treats this error as
recoverable and goes into a ten retry loop with a three second delay
before each retry.
The result at MediaPlayer client level is
MediaPlayer.MEDIA_ERROR_UNKNOWN error. This error code is used for
non-recoverable situations such as when an invalid redirect is
encountered or the destination is unreachable.
Bug:
20026006
Change-Id: I10f0dadb7740902f8c7c73d0df96cfff31f08ada
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:55:05 +0000 (00:55 +0000)]
am
3d1a37e9: am
38d969c5: am
558907f7: am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
3d1a37e9ecffd89f61de27d924b0469a6a09ea8c':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:44:42 +0000 (00:44 +0000)]
am
38d969c5: am
558907f7: am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
38d969c5c85f930cefef6f2fcad99d5aa8a0d5f7':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:32:53 +0000 (00:32 +0000)]
am
558907f7: am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
558907f702ab21d4166d5d7f7986cb18c4a993bd':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:22:51 +0000 (00:22 +0000)]
am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
0d2f280310458d23618edf6550818f8f9cfa6b47':
doc: Add Korean version of DAC/distribute/ page.
Ryosuke Matsuuchi [Sun, 19 Apr 2015 00:15:09 +0000 (00:15 +0000)]
Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
Dirk Dougherty [Sat, 18 Apr 2015 23:54:58 +0000 (23:54 +0000)]
am
488e5bbc: am
1696552f: am
6e141199: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
488e5bbc2333adb1c84be90b797e1a8d36d070c3':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:43:54 +0000 (23:43 +0000)]
am
1696552f: am
6e141199: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
1696552f127c82aed9036eb1fa6b44c826d57eec':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:32:46 +0000 (23:32 +0000)]
am
6e141199: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
6e141199874f0c5603dee4fccc728412dad07d61':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:22:48 +0000 (23:22 +0000)]
am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
ff233af75f2201c2724f8b388c39d3abeb8c6a2e':
Doc change: distribute landing page.
Dirk Dougherty [Sat, 18 Apr 2015 23:11:40 +0000 (23:11 +0000)]
Merge "Doc change: distribute landing page." into lmp-docs
Dirk Dougherty [Mon, 10 Nov 2014 19:50:41 +0000 (11:50 -0800)]
Doc change: distribute landing page.
Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be
Sean Wan [Fri, 17 Apr 2015 23:55:21 +0000 (23:55 +0000)]
am
b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
* commit '
b792f43301c61cce996dd5bac4589b4720a37bec':
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
Sean Wan [Fri, 17 Apr 2015 23:45:37 +0000 (23:45 +0000)]
Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
Sean Wan [Tue, 14 Apr 2015 21:26:40 +0000 (14:26 -0700)]
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
Bug:
19335429
Change-Id: I167af190f0e448915f50d8edf853cf8a33646d44
Dmitriy Ivanov [Fri, 17 Apr 2015 19:20:22 +0000 (19:20 +0000)]
am
b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
b0557acebc7a47f6d8a3653c376165160fc68105':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
Dmitriy Ivanov [Fri, 17 Apr 2015 19:01:40 +0000 (19:01 +0000)]
Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
Dmitriy Ivanov [Fri, 17 Apr 2015 18:50:29 +0000 (11:50 -0700)]
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
It is no longer needed.
Change-Id: I1b5a58528507df35cc0792a18be5583e3605cbe0
Dan Albert [Fri, 17 Apr 2015 18:06:54 +0000 (18:06 +0000)]
am
fef8bcf9: Merge "Explicitly use clang."
* commit '
fef8bcf92167fbfe06cfb4a18ddf12f272cae5f0':
Explicitly use clang.
Dan Albert [Fri, 17 Apr 2015 17:43:35 +0000 (17:43 +0000)]
Merge "Explicitly use clang."
Dan Albert [Fri, 17 Apr 2015 17:40:48 +0000 (10:40 -0700)]
Explicitly use clang.
This was implicitly enabled by using ASAN.
Change-Id: I562402a8191e2a3ab3eefd43860fbe7c58d441d8
Rich Slogar [Fri, 17 Apr 2015 17:37:51 +0000 (17:37 +0000)]
am
c1002dfc: am
71a616e0: am
203a4739: am
1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs
* commit '
c1002dfc52ec2827d24b6c4722a47abbb99b7f16':
docs: studio remove gradle tasks dialog
Rich Slogar [Fri, 17 Apr 2015 17:37:45 +0000 (17:37 +0000)]
am
1252b4b8: am
61dd1dfd: am
684f3aa2: am
efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs
* commit '
1252b4b8694a69150b79ecfd801ed62c6929edf3':
docs: hierarchyviewer updates
OSDN Git Service
