OSDN Git Service
Luan Nguyen [Wed, 22 Apr 2015 20:48:02 +0000 (20:48 +0000)]
am
34997731: cherrypick from lmp-docs docs: Add Channel API summary for Wear. Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
* commit '
34997731954015ce4e946ce696d487db17b848c1':
cherrypick from lmp-docs docs: Add Channel API summary for Wear. Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
Marco Nelissen [Wed, 22 Apr 2015 20:42:41 +0000 (20:42 +0000)]
am
3430f599: am
ba43f7e9: Merge "Revert "Sometimes the application context is null""
* commit '
3430f59951328c6d17045fbc8f85f629723af541':
Revert "Sometimes the application context is null"
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:41:57 +0000 (19:41 +0000)]
am
9e05ece7: am
0601a280: Merge "Sometimes the application context is null"
* commit '
9e05ece7ab8510fc3dade202a8647de22f4b0906':
Sometimes the application context is null
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"
Quddus Chong [Wed, 22 Apr 2015 17:18:32 +0000 (17:18 +0000)]
am
8408cbe3: cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug:
20304402
* commit '
8408cbe3adc8b0df4ae279a2e8689d1066972744':
cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug:
20304402
Kris Giesing [Wed, 22 Apr 2015 17:18:28 +0000 (17:18 +0000)]
am
0ab9655a: (-s ours) Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs
* commit '
0ab9655ae1a84d1f4dd79c964b655555cf684bbd':
DO NOT MERGE Revert "Load libraries directly from apk"
Kris Giesing [Wed, 22 Apr 2015 17:18:24 +0000 (17:18 +0000)]
am
6cf2d35d: (-s ours) Merge "DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"" into lmp-mr1-ub-docs
* commit '
6cf2d35d3b8bb2bf707098b84d16e3135f8ba498':
DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"
Kris Giesing [Wed, 22 Apr 2015 17:18:17 +0000 (17:18 +0000)]
am
663cdc5c: Tweak wording on release notes for Leanback.
* commit '
663cdc5cfdcff532f0ae43d851cce3172fa5da54':
Tweak wording on release notes for Leanback.
Rich Slogar [Wed, 22 Apr 2015 17:18:06 +0000 (17:18 +0000)]
am
1c6c22d3: docs: support library 22.1 updates
* commit '
1c6c22d3a92b1446eb548b2aca77758534c7d814':
docs: support library 22.1 updates
Ryosuke Matsuuchi [Wed, 22 Apr 2015 17:17:59 +0000 (17:17 +0000)]
am
2fb3dc2f: doc: Add Korean version of DAC/distribute/ page.
* commit '
2fb3dc2f965db595b6bf2c8c17a170552ccd15e7':
doc: Add Korean version of DAC/distribute/ page.
Dirk Dougherty [Wed, 22 Apr 2015 17:17:55 +0000 (17:17 +0000)]
am
7e75d3ec: Doc change: distribute landing page.
* commit '
7e75d3ec4b966442a46f16cf09a54ab541141bc8':
Doc change: distribute landing page.
Joe Fernandez [Wed, 22 Apr 2015 17:17:50 +0000 (17:17 +0000)]
am
7ce1ab5f: Merge "docs: studio remove gradle tasks dialog" into lmp-mr1-ub-docs
* commit '
7ce1ab5ffbc7c43013b2cf07ca4eb64152679d2b':
docs: studio remove gradle tasks dialog
Rich Slogar [Wed, 22 Apr 2015 17:17:45 +0000 (17:17 +0000)]
am
6b1b71c9: docs: hierarchyviewer updates
* commit '
6b1b71c96338775da77629ce3f3ed865616fb661':
docs: hierarchyviewer updates
Justin Koh [Wed, 22 Apr 2015 00:53:38 +0000 (00:53 +0000)]
am
ba75135a: am
2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev
* commit '
ba75135a807c87f4d6c14e69b1246eabd39f4117':
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
ztenghui [Wed, 22 Apr 2015 00:53:34 +0000 (00:53 +0000)]
am
059451e1: am
23606598: DO NOT MERGE: Reset the Node status when clone.
* commit '
059451e18504d6fbbedacaeefe0f2b62b355104d':
DO NOT MERGE: Reset the Node status when clone.
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 [Wed, 22 Apr 2015 00:12:30 +0000 (00:12 +0000)]
am
fb861b6c: am
31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
* commit '
fb861b6c8d255fc31f3460e39681a4fee35f156b':
Frameworks/base: Compile-time optimize SQLiteConnection
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
Mathieu Chartier [Tue, 21 Apr 2015 23:42:42 +0000 (23:42 +0000)]
am
765d7c30: am
ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
* commit '
765d7c304871044eaaa92974c295b52faa6244b0':
Update getExportedPropertyMethods to new reflection API
Andreas Gampe [Tue, 21 Apr 2015 23:42:38 +0000 (23:42 +0000)]
am
c7f9f765: am
189d2785: Merge "Frameworks/base: Fix comment"
* commit '
c7f9f7656fc8d3538adddab75f6b1fc48387a719':
Frameworks/base: Fix comment
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
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
Luan Nguyen [Mon, 13 Apr 2015 18:02:32 +0000 (11:02 -0700)]
cherrypick from lmp-docs docs: Add Channel API summary for Wear.
Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
bug:
20089257
Change-Id: I25ad962ef847574d2152229ebb2ce268483c2a68
Mathieu Chartier [Fri, 17 Apr 2015 19:49:57 +0000 (12:49 -0700)]
Update getExportedPropertyMethods to new reflection API
Bug:
19264997
Change-Id: Ife79c469fdb09f30e3aefcfc3e0ce5ed32303fce
Deepanshu Gupta [Tue, 21 Apr 2015 17:34:11 +0000 (17:34 +0000)]
Merge "Add resources to recyclerview dependency." into lmp-mr1-ub-dev
Quddus Chong [Fri, 17 Apr 2015 22:01:16 +0000 (15:01 -0700)]
cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support
Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
bug:
20304402
Change-Id: I697f57335b671d5f17685c1f82d7c9158e6d4ce6
Andreas Gampe [Tue, 21 Apr 2015 16:10:26 +0000 (16:10 +0000)]
Merge "Frameworks/base: Fix comment"
Olawale Ogunwale [Tue, 21 Apr 2015 16:08:49 +0000 (16:08 +0000)]
am
f7be8b67: am
fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
* commit '
f7be8b6739f174919ad01dcd32788b1b67c6820a':
[ActivityManager] Move UI operation to UI handler
Olawale Ogunwale [Tue, 21 Apr 2015 16:08:45 +0000 (16:08 +0000)]
am
acaa886c: am
0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"
* commit '
acaa886ce765c58c1e71b440b623a16ae419f5da':
[ActivityManager] Avoid unnecessary restart provider process
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:47:42 +0000 (15:47 +0000)]
am
886e8e11: am
2fdd83a9: am
d2545775: am
4c20df0b: am
4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
* commit '
886e8e1137fa7acad558c297891e61c20b43b036':
docs: Add Channel API summary for Wear.
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
Craig Mautner [Tue, 21 Apr 2015 15:30:44 +0000 (15:30 +0000)]
am
14818725: am
80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit '
148187255ecaaaf6a35920f779fa6a171433ccd4':
Prevent infinite layout and wallpaper flashing
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, 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:36:27 +0000 (04:36 +0000)]
am
1f4f92ed: am
b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
* commit '
1f4f92ed7401b1bb2a1cacb5d82122729357d133':
Frameworks/base: Use better Class.forName in ZygoteInit
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:42:39 +0000 (23:42 +0000)]
am
8cde8f7f: am
b1c838e0: am
6f142008: am
220f360e: am
900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
* commit '
8cde8f7f1ed1334dba58a62fc6fd3077f72ced96':
docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug:
20304402
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
Kris Giesing [Mon, 20 Apr 2015 22:03:46 +0000 (22:03 +0000)]
Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs
Kris Giesing [Mon, 20 Apr 2015 22:03:30 +0000 (22:03 +0000)]
Merge "DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"" into lmp-mr1-ub-docs
Kris Giesing [Mon, 20 Apr 2015 20:22:26 +0000 (13:22 -0700)]
DO NOT MERGE Revert "Load libraries directly from apk"
This reverts commit
dec4688f40b0018fbd1f00db05581966f531d88f.
Change-Id: Ief869dec1641d5a376bc044719941536e0bf8442
Kris Giesing [Mon, 20 Apr 2015 20:22:18 +0000 (13:22 -0700)]
DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"
This reverts commit
acc8c09d3a12d00b565a76acc26061172c3dd3c6.
Change-Id: I3c11ddd66d22ab2756201b489127f1643fedb429
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:45:05 +0000 (18:45 +0000)]
am
7b55b8f0: am
c77c14c2: Merge "Make MediaPlayer fail fast on UnknownServiceException."
* commit '
7b55b8f0563d540804b14c1643b0adfea19a71b1':
Make MediaPlayer fail fast on UnknownServiceException.
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.
Kris Giesing [Mon, 20 Apr 2015 18:12:06 +0000 (11:12 -0700)]
Tweak wording on release notes for Leanback.
Change-Id: I1450fef7100d4b557e5dab65bbb2681235f05439
Alex Klyubin [Mon, 20 Apr 2015 17:54:14 +0000 (17:54 +0000)]
Merge "Make MediaPlayer fail fast on UnknownServiceException."
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
Rich Slogar [Mon, 13 Apr 2015 21:01:04 +0000 (14:01 -0700)]
docs: support library 22.1 updates
Change-Id: Ia784597a6b55d322bca3aaf07b35c53d3b4b182c
(cherry picked from commit
1e517de5fcc1da97c0e33e57ee19c930a188a7d5)
Ryosuke Matsuuchi [Tue, 14 Apr 2015 09:44:35 +0000 (18:44 +0900)]
doc: Add Korean version of DAC/distribute/ page.
Bug:
20204101
Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb
(cherry picked from commit
19a7b546190f91c93089084f854e277083094961)
Dirk Dougherty [Mon, 10 Nov 2014 19:50:41 +0000 (11:50 -0800)]
Doc change: distribute landing page.
Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be
(cherry picked from commit
1792ec17b8a352a2469e2136c6ea9bb34d99b282)
Joe Fernandez [Sun, 19 Apr 2015 23:05:28 +0000 (23:05 +0000)]
Merge "docs: studio remove gradle tasks dialog" into lmp-mr1-ub-docs
Rich Slogar [Tue, 31 Mar 2015 23:49:01 +0000 (16:49 -0700)]
docs: hierarchyviewer updates
b/
19955159
Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
(cherry picked from commit
f9f81b49d04ba5beb5a360265e808a7d6e9ed269)
Rich Slogar [Wed, 11 Feb 2015 00:18:59 +0000 (16:18 -0800)]
docs: studio remove gradle tasks dialog
Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
(cherry picked from commit
caa15d49f968720f51a096b93e0412e97db269a1)
Ryosuke Matsuuchi [Sun, 19 Apr 2015 01:30:42 +0000 (01:30 +0000)]
am
fea08ccd: am
3d1a37e9: am
38d969c5: am
558907f7: am
0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs
* commit '
fea08ccdffdf3d56276f84cf5b01165e6b2bb85f':
doc: Add Korean version of DAC/distribute/ page.
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 [Sun, 19 Apr 2015 00:05:38 +0000 (00:05 +0000)]
am
308cd160: am
488e5bbc: am
1696552f: am
6e141199: am
ff233af7: Merge "Doc change: distribute landing page." into lmp-docs
* commit '
308cd16022c43b64e5621dbf6938c8ee5ad22aa9':
Doc change: distribute landing page.
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 [Sat, 18 Apr 2015 00:04:38 +0000 (00:04 +0000)]
am
d1a72651: am
b792f433: Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
* commit '
d1a72651ed723b8e89875cdd7e0429f1c35ca8c2':
DO NOT MERGE: Make wifi scan interval when disconnected configurable.
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:30:56 +0000 (19:30 +0000)]
am
a04b4302: am
b0557ace: Merge "Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS"
* commit '
a04b43020e1289e8b7b2501471740ace944f18d5':
Remove LOCAL_JNI_SHARED_LIBRARIES_ZIP_OPTIONS
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