OSDN Git Service
Deepanshu Gupta [Tue, 13 May 2014 02:19:56 +0000 (02:19 +0000)]
am
a2b34c96: Optimize layout rendering in layoutlib [DO NOT MERGE]
* commit '
a2b34c96f1ef24d96854d1e23426dec7774510e8':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:19:52 +0000 (02:19 +0000)]
am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
e183855c1eb7baf750c67bb20e70fb887eba7af6':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:19:49 +0000 (02:19 +0000)]
am
e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]
* commit '
e5a2347bc6cf1506799136af4c9724275ca0247e':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:19:46 +0000 (02:19 +0000)]
am
30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '
30505abeb6cda9d042ec41f2563d561714eac46b':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:57:34 +0000 (18:57 -0700)]
resolved conflicts for merge
5a7b3b65 to jb-dev-plus-aosp
Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8
Deepanshu Gupta [Tue, 13 May 2014 01:52:32 +0000 (01:52 +0000)]
am
4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
* commit '
4b5da86d04200ba278b62ff99da91e212b87e9af':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:52:28 +0000 (01:52 +0000)]
am
5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
* commit '
5c166c9c04b6ea9d4955830e7ba277be71f17a6f':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:52:25 +0000 (01:52 +0000)]
am
2d82586b: Fix CalendarView to show the right labels. [DO NOT MERGE]
* commit '
2d82586b96593b1b3b5280d77d5ae9a09df9d1fd':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:52:21 +0000 (01:52 +0000)]
am
64dc0380: Fix layoutlib [DO NOT MERGE]
* commit '
64dc0380127047ffcf135b6848c9150aa8dbed85':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:52:18 +0000 (01:52 +0000)]
am
a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]
* commit '
a59c27dd6674a31c875b0baa86519caec628ca2d':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 01:52:15 +0000 (01:52 +0000)]
am
8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]
* commit '
8a39c3afb29f2540b05319042e758dd4d5f73a1e':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 21 Jan 2014 01:02:37 +0000 (17:02 -0800)]
Optimize layout rendering in layoutlib [DO NOT MERGE]
The height of a layout should be zero if it is assigned a layout_weight.
This way, the layout is measured only once and prevents spurious errors.
Bug: https://code.google.com/p/android/issues/detail?id=58398
Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a
(cherry-picked from
5712b5fc3fec0dc376e84f660f2fe0d1102c0cbb)
Deepanshu Gupta [Sat, 1 Feb 2014 03:03:48 +0000 (19:03 -0800)]
Add methods for Time_Delegate [DO NOT MERGE]
Bug: http://b.android.com/65359
Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923
(cherry-picked from
02cde9ceeb4c052ee273a5d809816dfd355ebb56)
Deepanshu Gupta [Tue, 12 Nov 2013 13:03:17 +0000 (18:33 +0530)]
Fix NPE in layoutlib. [DO NOT MERGE]
Change-Id: I36623304d83b344ea078044001577b8005a63c02
(cherry picked from commit
689c0dfe72a57c0555560012cbc6806375e7d4b7)
Deepanshu Gupta [Fri, 8 Nov 2013 11:13:07 +0000 (16:43 +0530)]
Fix text size in Fake Action Bar. [DO NOT MERGE]
The density multiplier was being applied twice to the title text in
the fake action bar.
Bug:
11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
(cherry-picked from
083d1562e00631630b5594462ce4a867a3508d8d)
Deepanshu Gupta [Tue, 10 Sep 2013 22:41:21 +0000 (15:41 -0700)]
Remove references to non-std Java classes. [DO NOT MERGE]
Do not add the non-standard Java classes. Updates the references to all
non-standard classes to new classes in
com.android.tools.layoulib.create package. This also treats
java.lang.AutoCloseable which is part of Java 7 similarly so that we can
still run on Java 6.
This also adapts the cherrypick for this branch by updating references
to the non-standard Java classes present in this branch. This also
includes the following change that includes some changes that the
original cherrypick missed.
Change-Id: I76c87c74ee088778b37d1a7a7d531e0fde5c758f
commit:
1ed75bde09275c9f2bd1f81830e381ea864ac7f5
Change-Id: Iac5b272652e2780c9bb72d19f415d150948ca589
(cherry picked from
80c668f2a076e91d887dbf77776cd503ff88b0b4)
Deepanshu Gupta [Sun, 13 Oct 2013 01:37:19 +0000 (18:37 -0700)]
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Issue: https://code.google.com/p/android/issues/detail?id=59732
Change-Id: I281b3fdad88c591281a3645592c84f3e2cb61d09
(cherry picked from commit
6335590aa8997944cc7fb358a315dbb9b789f87f)
Deepanshu Gupta [Sun, 13 Oct 2013 04:28:50 +0000 (21:28 -0700)]
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Issue: https://code.google.com/p/android/issues/detail?id=60993
Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25
(cherry picked from commit
11ee746dc5e77f4f33aac45ac9e344444223012d)
Deepanshu Gupta [Tue, 15 Oct 2013 01:14:58 +0000 (18:14 -0700)]
Fix CalendarView to show the right labels. [DO NOT MERGE]
Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
(cherry picked from commit
44bcd64e5b9fd211dd56b0598693a0559f65dc1a)
Deepanshu Gupta [Thu, 17 Oct 2013 03:27:51 +0000 (20:27 -0700)]
Fix layoutlib [DO NOT MERGE]
Fix a NPE.
The cherry-pick differs slightly from the original to remove changes not
relevant to the current branch.
Bug:
11140701
Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
(cherry-picked from
87be67f91719234cbd381ff0242b5efc8b6aa257)
Deepanshu Gupta [Tue, 10 Sep 2013 22:39:41 +0000 (15:39 -0700)]
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Bug: b.android.com/59300
Change-Id: Ia350adb3308daa8170bff755302760790163c811
(cherry picked from commit
7b5d54f05be61a7ab40021644a91c466e2897627)
Deepanshu Gupta [Fri, 12 Jul 2013 22:24:51 +0000 (15:24 -0700)]
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Update the configuration with the device orientation before rendering.
Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
(cherry picked from commit
d4875e19f5b7c69226783b0a6590831466159f84)
Kenny Root [Fri, 18 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
ecb013dbff5e33b95c49015fa375579e055911ae':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 17:12:40 +0000 (17:12 +0000)]
Merge "Use hidden API to validate APK chains" into jb-dev
Kenny Root [Thu, 17 Apr 2014 21:03:31 +0000 (14:03 -0700)]
Use hidden API to validate APK chains
Bug:
13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
Robert Greenwalt [Mon, 7 Apr 2014 19:36:54 +0000 (19:36 +0000)]
am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Fri, 7 Feb 2014 11:52:12 +0000 (03:52 -0800)]
DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:
12663469
Change-Id: I98c0672a6d9c8d5bc4f160849aa0fa182073216b
Marco Nelissen [Thu, 20 Mar 2014 17:04:23 +0000 (10:04 -0700)]
am
a3337bc7: Merge "Verify certificates" into jb-dev
* commit '
a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 16:58:36 +0000 (16:58 +0000)]
Merge "Verify certificates" into jb-dev
Victoria Lease [Wed, 19 Mar 2014 21:27:19 +0000 (14:27 -0700)]
am
1c12f9e7: malloc some advances
* commit '
1c12f9e76298c757423155ad812890d27effafe8':
malloc some advances
Victoria Lease [Mon, 17 Mar 2014 23:03:28 +0000 (16:03 -0700)]
malloc some advances
Bug:
13506939
Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
(cherry picked from commit
3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)
Marco Nelissen [Thu, 13 Mar 2014 21:18:59 +0000 (14:18 -0700)]
Verify certificates
b/
13418320
Cherrypicked from
7e435a011dd519f76a8ec1a8ed99a22bee5c3e26
https://googleplex-android-review.git.corp.google.com/#/c/433316/
Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c
Paul Lawrence [Thu, 27 Feb 2014 19:16:49 +0000 (11:16 -0800)]
am
b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.
* commit '
b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
Prevent authenticators from using Settings to launch arbitrary activities.
Paul Lawrence [Wed, 26 Feb 2014 23:42:34 +0000 (15:42 -0800)]
Prevent authenticators from using Settings to launch arbitrary activities.
Various authenticator results such as getAuthToken and addAccount might
result in an Intent returned to the AccountManager caller. A malicious
authenticator could exploit the fact that the Settings are a system app,
lead the user to launch add account for their account type and thus get
Settings to use the intent to start some arbitrary third parties Activity.
The fix is to make sure that the UID of the app associated with Activity
to be launched by the supplied intent and the Authenticators UID share
the same signature. This means that an authenticator implementer can only
exploit apps they control.
This is a backport of
5bab9daf3cf66f4de19f8757e386030e8bef23ce
Bug:
7699048
Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2
David Christie [Fri, 10 Jan 2014 20:53:41 +0000 (12:53 -0800)]
am
8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
* commit '
8e0c7768c87014fef277df84c737dd6c37fb8866':
DO NOT MERGE: Clear cached locations when location providers disabled Bug:
12118307
David Christie [Tue, 7 Jan 2014 01:57:30 +0000 (17:57 -0800)]
DO NOT MERGE: Clear cached locations when location providers disabled
Bug:
12118307
Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932
Christopher Tate [Fri, 8 Nov 2013 20:27:10 +0000 (12:27 -0800)]
am
50cbfd55: System package permission decls take precedence over 3rd party apps\'
* commit '
50cbfd554f0bdf05c701d8baf15c862fbb8a6dc0':
System package permission decls take precedence over 3rd party apps'
Christopher Tate [Tue, 5 Nov 2013 20:28:10 +0000 (12:28 -0800)]
System package permission decls take precedence over 3rd party apps'
In particular, if a 3rd party app tries to define a permission that
turns out to be defined by system packages following an upgrade,
the system package gets ownership and grants are re-evaluated
on that basis.
Bug
11242510
(Cherry-pick backport to JB)
Change-Id: Iabf7b6280e6c6674a51af5624142bd19ea0750ed
Amith Yamasani [Fri, 27 Sep 2013 18:10:36 +0000 (11:10 -0700)]
am
42786418: Don\'t instantiate non-Fragments in Fragment.instantiate
* commit '
427864188dfc5dd803b15797379b9dc6673abd16':
Don't instantiate non-Fragments in Fragment.instantiate
Amith Yamasani [Thu, 26 Sep 2013 23:14:36 +0000 (16:14 -0700)]
Don't instantiate non-Fragments in Fragment.instantiate
Backport...
Fix for PreferenceActivities being invoked with non-Fragment class
names via extras in the intent. Make sure that the constructor
doesn't get called if the class name is not for a Fragment type.
Bug:
9901133
Change-Id: I227756fb4246deac796cee09077e482237bb5b0d
Kenny Root [Wed, 14 Aug 2013 00:27:49 +0000 (17:27 -0700)]
am
32c99004: Use hostname verifier directly instead of instance
* commit '
32c990044f027542a034a7606cf010dca6df252f':
Use hostname verifier directly instead of instance
Kenny Root [Wed, 24 Jul 2013 03:36:03 +0000 (20:36 -0700)]
Use hostname verifier directly instead of instance
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.
(cherry picked from commit
928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)
Bug:
9984058
Change-Id: I56565afa0394dc98054abbaef06ac9bfff009e56
Christopher Tate [Mon, 6 May 2013 21:53:10 +0000 (14:53 -0700)]
am
81c1d8d3: Ensure install-during-restore is like install-then-restore
* commit '
81c1d8d3a5aef6a423f0bb02de1b362b2f2d12df':
Ensure install-during-restore is like install-then-restore
Christopher Tate [Mon, 6 May 2013 20:07:05 +0000 (13:07 -0700)]
Ensure install-during-restore is like install-then-restore
When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.
Bug
8833099
(cherry picked from commit
2baf6dcfcf7fc1705db25e64dc0cb11fa3509d39)
Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e
Nick Kralevich [Mon, 29 Apr 2013 22:38:40 +0000 (15:38 -0700)]
am
6d8f5b75: libdrm: fix bad strncpy / snprintf calls
* commit '
6d8f5b755b133b308204b84145d773d401cdcd52':
libdrm: fix bad strncpy / snprintf calls
Nick Kralevich [Mon, 29 Apr 2013 17:49:47 +0000 (10:49 -0700)]
libdrm: fix bad strncpy / snprintf calls
Fix the following bugs reported by IOActive:
* GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow
* GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow
* GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow
* GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow
* GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow
Bug:
8727221
(cherry picked from commit
25619b2c6b3fd584affe20f34bfbf164a5ddbe7d)
Change-Id: I9a99c9b8a63c8b9efb3b2b650c735467b77120f2
Selim Gurun [Fri, 5 Apr 2013 19:05:52 +0000 (12:05 -0700)]
am
93c39d5d: DO NOT MERGE Fix issues during backport
* commit '
93c39d5d4fe8a31da35f8d1d522acb7b676946af':
DO NOT MERGE Fix issues during backport
Selim Gurun [Thu, 4 Apr 2013 23:20:29 +0000 (16:20 -0700)]
DO NOT MERGE Fix issues during backport
Fix issues related to I219accd5db0c8a0e64b8aab3b049a8cee7dc168f.
Change-Id: Iacf72a9c618d59601c373de948a3f7cbfcbd7038
Selim Gurun [Thu, 4 Apr 2013 18:08:35 +0000 (11:08 -0700)]
am
7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
* commit '
7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6':
DO NOT MERGE Add a delimiter between scheme and host
Selim Gurun [Thu, 4 Apr 2013 18:00:46 +0000 (11:00 -0700)]
am
38915fd4: Revert "Add a delimiter between scheme and host"
* commit '
38915fd4d466cc233189bf5b5c11d7f03a416d35':
Revert "Add a delimiter between scheme and host"
Selim Gurun [Fri, 8 Mar 2013 22:23:00 +0000 (14:23 -0800)]
DO NOT MERGE Add a delimiter between scheme and host
Bug:
6923539
Change-Id: I219accd5db0c8a0e64b8aab3b049a8cee7dc168f
Selim Gurun [Thu, 4 Apr 2013 17:14:29 +0000 (17:14 +0000)]
Revert "Add a delimiter between scheme and host"
This reverts commit
aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8
Change-Id: I19e98182e97b8e81cabe3ff09897b82d50ce968e
Selim Gurun [Thu, 4 Apr 2013 04:05:40 +0000 (21:05 -0700)]
am
aa2163dd: Add a delimiter between scheme and host
* commit '
aa2163dd2a7b59b284cfe8a2ff3966a1a1b0ebb8':
Add a delimiter between scheme and host
Selim Gurun [Fri, 8 Mar 2013 22:23:00 +0000 (14:23 -0800)]
Add a delimiter between scheme and host
Bug:
6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
Christopher Tate [Mon, 25 Mar 2013 21:05:47 +0000 (14:05 -0700)]
am
0cb27e28: Validate restored file paths against their nominal domain
* commit '
0cb27e28071af59000198c8588c588a2e63cc0a3':
Validate restored file paths against their nominal domain
Christopher Tate [Mon, 25 Mar 2013 17:06:34 +0000 (10:06 -0700)]
Validate restored file paths against their nominal domain
Bug
8460775
(cherry picked from commit
7323765bbf13d9638cf2cc1e06113bffcdac46c4)
Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9
Jeff Sharkey [Sat, 2 Mar 2013 01:20:51 +0000 (17:20 -0800)]
am
a2e929e1: Tighten enforcement of file modes.
* commit '
a2e929e1df62947b7967258f21fd05b27a571878':
Tighten enforcement of file modes.
Jeff Sharkey [Thu, 28 Feb 2013 23:57:36 +0000 (15:57 -0800)]
Tighten enforcement of file modes.
Bug:
8275867
Change-Id: I4da14f2dd0049aca69636999696c1f3c02b3b792
Joe Malin [Wed, 19 Dec 2012 18:33:14 +0000 (10:33 -0800)]
am
c84b3603: am
8dd6275e: Android Training: Multiple Threads
* commit '
c84b3603fa27db68516187cea19de1e6a021152d':
Android Training: Multiple Threads
Joe Malin [Wed, 19 Dec 2012 18:31:39 +0000 (10:31 -0800)]
am
8dd6275e: Android Training: Multiple Threads
* commit '
8dd6275e2871bea1acb20cbdd98ea0451b3d5be0':
Android Training: Multiple Threads
Joe Malin [Mon, 26 Nov 2012 22:06:35 +0000 (14:06 -0800)]
Android Training: Multiple Threads
Change-Id: I58c472aa5ed82f6b4fb50d9bbb4e66841b9e99c3
Joe Malin [Fri, 14 Dec 2012 02:03:38 +0000 (18:03 -0800)]
am
7eef172e: am
ba34f097: Android Training: Loading Data in the Background
* commit '
7eef172e9b1c4ffc97cb7b9ea4216c718a832926':
Android Training: Loading Data in the Background
Joe Malin [Fri, 14 Dec 2012 01:58:19 +0000 (17:58 -0800)]
am
ba34f097: Android Training: Loading Data in the Background
* commit '
ba34f097df278ce1861ebfecdaf634f519ba1f36':
Android Training: Loading Data in the Background
Joe Malin [Tue, 6 Nov 2012 01:22:24 +0000 (17:22 -0800)]
Android Training: Loading Data in the Background
Change-Id: Ibb469cd068068b37ea95371afb7e4dca4535ba94
Joe Malin [Fri, 14 Dec 2012 00:16:54 +0000 (16:16 -0800)]
am
718c7484: am
f0f5efbe: Android Training: Run in a Background Service
* commit '
718c7484cf008d45f8501ae7d0cd57b31f935934':
Android Training: Run in a Background Service
Joe Malin [Fri, 14 Dec 2012 00:15:36 +0000 (16:15 -0800)]
am
f0f5efbe: Android Training: Run in a Background Service
* commit '
f0f5efbea206fd0fbac655519f3f535620ed74cc':
Android Training: Run in a Background Service
Joe Malin [Sat, 27 Oct 2012 18:16:19 +0000 (11:16 -0700)]
Android Training: Run in a Background Service
Change-Id: I002af57c65eccd0a624e00ef4b1607469199ce6b
Robert Greenwalt [Fri, 30 Nov 2012 18:05:33 +0000 (10:05 -0800)]
am
b8da0376: Secure a handful of framework broadcasts
* commit '
b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
Secure a handful of framework broadcasts
Robert Greenwalt [Thu, 29 Nov 2012 00:42:32 +0000 (16:42 -0800)]
Secure a handful of framework broadcasts
At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.
bug:
7622253
(cherry picked from commit
47918ae3b4e7ebb54711884e9ff9d0300591ab8b)
Conflicts:
core/res/AndroidManifest.xml
Change-Id: I118b31489fe7add5b8d69289cab9f4e8ab269495
kmccormick@google.com [Wed, 28 Nov 2012 00:54:01 +0000 (16:54 -0800)]
am
a880436f: am
b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
* commit '
a880436f4416168d256822a23bd23f936136706d':
Doc update: new Notify User AU class
kmccormick@google.com [Wed, 28 Nov 2012 00:52:00 +0000 (16:52 -0800)]
am
b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs
* commit '
b7863a3ce4db964322783ff7e84acc5713e04d1d':
Doc update: new Notify User AU class
&& repo sync -j8 [Wed, 28 Nov 2012 00:49:36 +0000 (16:49 -0800)]
Merge "Doc update: new Notify User AU class" into jb-dev-docs
&& repo sync -j8 [Thu, 4 Oct 2012 23:34:23 +0000 (16:34 -0700)]
Doc update: new Notify User AU class
Change-Id: Idcda9535c5aa2602cf4f0aecb3ab4b1518ab966b
kmccormick@google.com [Tue, 20 Nov 2012 00:54:48 +0000 (16:54 -0800)]
am
2f9947e9: am
ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
* commit '
2f9947e9aa2b795dbc7db282a99a09410f1fadf2':
Doc Update: Removed "no guaranteed delivery" line.
kmccormick@google.com [Tue, 20 Nov 2012 00:53:11 +0000 (16:53 -0800)]
am
ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
* commit '
ddf10d44c12fbd8ffb115c847913296b455f412d':
Doc Update: Removed "no guaranteed delivery" line.
&& repo sync -j8 [Tue, 20 Nov 2012 00:51:08 +0000 (16:51 -0800)]
Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs
kmccormick@google.com [Thu, 15 Nov 2012 17:49:21 +0000 (09:49 -0800)]
am
f53c5f36: am
d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '
f53c5f3683b71d232a78e04ea06649dd5e4bfee1':
Doc Update: Fixing images
kmccormick@google.com [Thu, 15 Nov 2012 17:45:46 +0000 (09:45 -0800)]
am
d1ae2721: Merge "Doc Update: Fixing images" into jb-dev-docs
* commit '
d1ae2721fa7b350b979e75319812636ea31bb56b':
Doc Update: Fixing images
&& repo sync -j8 [Thu, 15 Nov 2012 17:43:17 +0000 (09:43 -0800)]
Merge "Doc Update: Fixing images" into jb-dev-docs
Scott Main [Thu, 15 Nov 2012 03:04:05 +0000 (19:04 -0800)]
resolved conflicts for merge of
e907a390 to jb-dev-plus-aosp
Change-Id: I4e216b81f33b4b7c238f74f1c475bc84df3f79ef
&& repo sync -j8 [Thu, 15 Nov 2012 02:26:07 +0000 (18:26 -0800)]
Doc Update: Fixing images
Bug:
7542170
Change-Id: I18e5d360e21af9d30864456ae429b804314e1edb
&& repo sync -j8 [Thu, 15 Nov 2012 02:15:53 +0000 (18:15 -0800)]
Doc Update: Removed "no guaranteed delivery" line.
Change-Id: I6f5b80d263069752b7d47b5825ff024b1858e41e
Scott Main [Thu, 15 Nov 2012 01:38:15 +0000 (17:38 -0800)]
am
22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis
* commit '
22cc2764cc74e52888b043e0c6371594305bb5e9':
implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the list of classes/lessons on each course landing page.
Scott Main [Thu, 8 Nov 2012 00:35:16 +0000 (16:35 -0800)]
implement new organization for Training classes
This also moves a few of the documents from API Guides > Best Practices
into the new courses for best practices.
This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d
which generates the list of classes/lessons on each course landing page.
Change-Id: I8132f72f78d844c3b035c7aa269ad3b88a25d02a
Joe Malin [Tue, 13 Nov 2012 22:22:58 +0000 (14:22 -0800)]
am
4979a0b5: am
5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '
4979a0b59486d737a4d9267af9b38f237705e26f':
Notification.java javadoc: addAction
Joe Malin [Tue, 13 Nov 2012 22:20:54 +0000 (14:20 -0800)]
am
5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs
* commit '
5f32d3375b13e581d3101ed8e928fd6a463f3809':
Notification.java javadoc: addAction
Joe Malin [Tue, 13 Nov 2012 22:14:23 +0000 (14:14 -0800)]
Merge "Notification.java javadoc: addAction" into jb-dev-docs
Scott Main [Tue, 13 Nov 2012 03:46:11 +0000 (19:46 -0800)]
am
ddf5efdf: am
52bfaaf7: docs: Android SDK Tools r21 Release Notes
* commit '
ddf5efdf45e32fab02bff6f9cd001098dcf5a444':
docs: Android SDK Tools r21 Release Notes
Scott Main [Tue, 13 Nov 2012 03:43:28 +0000 (19:43 -0800)]
am
52bfaaf7: docs: Android SDK Tools r21 Release Notes
* commit '
52bfaaf7444c8b4d571d0c81fadbb1609411d6e1':
docs: Android SDK Tools r21 Release Notes
Scott Main [Tue, 13 Nov 2012 03:39:58 +0000 (19:39 -0800)]
docs: Android SDK Tools r21 Release Notes
Change-Id: I7496c2af7592d8080ca4d0618466a9ccc578d0dd
Scott Main [Tue, 13 Nov 2012 02:07:57 +0000 (18:07 -0800)]
am
b590b0b3: am
6453dfb7: update Download and installation guides for ADT Bundle
* commit '
b590b0b37ad2a255f8923ed7037514333a3d8ff5':
update Download and installation guides for ADT Bundle
Scott Main [Tue, 13 Nov 2012 02:05:04 +0000 (18:05 -0800)]
am
6453dfb7: update Download and installation guides for ADT Bundle
* commit '
6453dfb79712c288bdf825a2a4c43e583e5c8aa4':
update Download and installation guides for ADT Bundle
Scott Main [Tue, 23 Oct 2012 21:14:18 +0000 (14:14 -0700)]
update Download and installation guides for ADT Bundle
Change-Id: I59d3113d4caf937b13e10c50618a37ae86d4ae55
kmccormick@google.com [Mon, 12 Nov 2012 23:02:55 +0000 (15:02 -0800)]
am
39cc8f80: am
4233c939: Merge "Doc Update: param name change" into jb-dev-docs
* commit '
39cc8f8079412f721c5003cd2d0cb07366b77da4':
Doc Update: param name change
kmccormick@google.com [Mon, 12 Nov 2012 23:00:12 +0000 (15:00 -0800)]
am
4233c939: Merge "Doc Update: param name change" into jb-dev-docs
* commit '
4233c939014c39ce9d95556db1b654e906f8ce5b':
Doc Update: param name change
&& repo sync -j8 [Mon, 12 Nov 2012 22:56:58 +0000 (14:56 -0800)]
Merge "Doc Update: param name change" into jb-dev-docs
&& repo sync -j8 [Mon, 12 Nov 2012 22:45:08 +0000 (14:45 -0800)]
Doc Update: param name change
Change-Id: I320374f8d40ba090a561fe173bb08837abaa263a
Joe Fernandez [Mon, 12 Nov 2012 22:35:27 +0000 (14:35 -0800)]
am
180200c2: am
aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs
* commit '
180200c2c126fc7db1a86ac49a235f40d1905731':
docs: NDK r8c Release Notes
Joe Fernandez [Mon, 12 Nov 2012 22:33:44 +0000 (14:33 -0800)]
am
1c350fa4: am
cee5dab6: Merge "docs: JOBB tool help page" into jb-dev-docs
* commit '
1c350fa458a6894abb7d4213d65c1c2833faaa7a':
docs: JOBB tool help page
Joe Fernandez [Mon, 12 Nov 2012 22:30:31 +0000 (14:30 -0800)]
am
aac29f12: Merge "docs: NDK r8c Release Notes" into jb-dev-docs
* commit '
aac29f126ea8c42313a5481b4871828bbd40b4a6':
docs: NDK r8c Release Notes
OSDN Git Service
