OSDN Git Service
smain@google.com [Tue, 26 Apr 2016 03:52:27 +0000 (03:52 +0000)]
clarify what\'s in each windows package and rename the other packages to command line tools am:
6b2a986
am:
6e56ea1
* commit '
6e56ea19aa90fbc6e385e33e60271985a8c422bc':
clarify what's in each windows package and rename the other packages to command line tools
Change-Id: Ie9434b0567d5f6b06fe2b9fad9d486c0e58e3c76
Amanda Kassay [Tue, 26 Apr 2016 03:52:26 +0000 (03:52 +0000)]
Tabs js error fix, DevSite css issues fix, Search filtering am:
ebcf397
am:
7a697e7
* commit '
7a697e73cb44fa401b42cfa46f4478e634ca39bc':
Change-Id: I18be4cc3d6207f067ff72245d437616817bba6b8
smain@google.com [Tue, 26 Apr 2016 03:52:26 +0000 (03:52 +0000)]
new styles and tab-highlighting to support custom Android Studio site design am:
190e610
am:
7a7b964
* commit '
7a7b9648145b47a292f7623d6e464b4486925703':
Change-Id: I770fc065da8129cfc18f692291516ea10f7d35de
smain@google.com [Tue, 26 Apr 2016 03:52:25 +0000 (03:52 +0000)]
tweak the NDK download analytics event tag am:
7281802
am:
2f7c889
* commit '
2f7c889e9d87771567afd62dec7556d7c21a4a53':
Change-Id: Ibd474c9890e336eb685d957a15570767ec87976e
Dirk Dougherty [Tue, 26 Apr 2016 03:52:24 +0000 (03:52 +0000)]
Update modal download dialogs for sdk/ndk download. Revise the redirect behavior once download completes. Add more appropriate title and download message when installing SDK tools only. Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state. Add styles for the Studio download page. am:
c607a4d
am:
29e355b
* commit '
29e355b2913349274cff1fce917b688bde24b76f':
Change-Id: I8a86e2a03d47a96b32451f38df49817d8a850bf6
Dirk Dougherty [Tue, 26 Apr 2016 03:52:23 +0000 (03:52 +0000)]
increment version for fetched js and cs files to avoid proxy caching. am:
0d268be
am:
248ef8d
* commit '
248ef8d191dd4288f09ee6ba4a2349cc8847b2ec':
Change-Id: I314f91f16effc570a6a0d1baf15b5afb1d039a79
Amanda Kassay [Tue, 26 Apr 2016 03:52:22 +0000 (03:52 +0000)]
Migrating web search api to custom search api on templates-sdk am:
843649b
am:
e774264
* commit '
e774264f515279e9030bc980bd8a5e83479ead18':
Change-Id: I98771a8e82474e5f6728642fb6c3eb30a2003142
smain@google.com [Tue, 26 Apr 2016 03:52:21 +0000 (03:52 +0000)]
new search results layout. no more custom suggestions; just API matches and organic results. am:
38b0e22
am:
4f9a67d
* commit '
4f9a67dbb37abda3d6ccea540c4fa827141ca2dc':
Change-Id: I9225b324395c0ecf0de29a5b955cf2f335615105
smain@google.com [Tue, 26 Apr 2016 03:52:20 +0000 (03:52 +0000)]
remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages am:
1c8d4a4
am:
b7595b8
* commit '
b7595b8256de938a5461c7f2221f9c7c40eb0406':
Change-Id: I35b2b7e59416120524c364c272869cdd35ce2fd4
Amanda Kassay [Tue, 26 Apr 2016 03:52:19 +0000 (03:52 +0000)]
Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer. am:
e4a8ab1
am:
5494db7
* commit '
5494db7fdb4f1f810239a63d2976eb6fa1ff2d92':
Change-Id: I94795ed54be71860b4b523453161f214394a19f9
smain@google.com [Thu, 7 Apr 2016 01:22:22 +0000 (01:22 +0000)]
clarify what\'s in each windows package and rename the other packages to command line tools
am:
6b2a986
* commit '
6b2a98630bd6d14f46b1e04e0cad6de95393eb8e':
clarify what's in each windows package and rename the other packages to command line tools
Change-Id: I725ac866c2b5dfa4a5a3daceea4f12f53b8d42af
smain@google.com [Thu, 7 Apr 2016 00:21:37 +0000 (17:21 -0700)]
clarify what's in each windows package and rename the other packages to command line tools
Change-Id: If054549ea3df8679342efb30a2c0f5fa607cb2a2
Trevor Johns [Wed, 6 Apr 2016 03:12:06 +0000 (20:12 -0700)]
Merge branch 'goog/mnc-mr-docs' into mnc-ub-dev
Large merge to reconnect automerger for docs branch to mainline.
Conflicts:
tools/droiddoc/templates-sdk/assets/css/default.css
tools/droiddoc/templates-sdk/sdkpage.cs
Issue:
28000173
Change-Id: If04c741090d99d384981b8b3554edc58eb82dd0e
Amanda Kassay [Tue, 5 Apr 2016 21:08:29 +0000 (21:08 +0000)]
Tabs js error fix, DevSite css issues fix, Search filtering
am:
ebcf397
* commit '
ebcf3977a28477df6e6fdbad3bf425581d19ccc1':
Tabs js error fix, DevSite css issues fix, Search filtering
Change-Id: I0ce8101f73505fc9cd6ebbb87549171f0a27d0a1
Amanda Kassay [Thu, 31 Mar 2016 14:03:57 +0000 (10:03 -0400)]
Tabs js error fix, DevSite css issues fix, Search filtering
Staged: http://akassay.nyc.corp.google.com:8080/index.html#q=Activity
Change-Id: Id25525a8d8c927ea67cd13b43652d75ce53733cf
smain@google.com [Tue, 5 Apr 2016 18:23:33 +0000 (18:23 +0000)]
new styles and tab-highlighting to support custom Android Studio site design
am:
190e610
* commit '
190e610df3f15c00d46e8ee5bec661363334a86e':
new styles and tab-highlighting to support custom Android Studio site design
Change-Id: I020f54c66e38ab23d996c80562bd80376bbb751d
smain@google.com [Mon, 4 Apr 2016 23:47:28 +0000 (16:47 -0700)]
new styles and tab-highlighting to support custom Android Studio site design
Change-Id: I27d11f4526ba79bce8deb5102cc2afbe34a0e116
smain@google.com [Mon, 4 Apr 2016 23:25:35 +0000 (23:25 +0000)]
tweak the NDK download analytics event tag
am:
7281802
* commit '
7281802438fc571471d6d739e27b020fc37cb295':
tweak the NDK download analytics event tag
Change-Id: Ied3fe64b85bfdaa9322429da7a9b75dc38321181
Dirk Dougherty [Mon, 4 Apr 2016 23:17:36 +0000 (23:17 +0000)]
Update modal download dialogs for sdk/ndk download. Revise the redirect behavior once download completes. Add more appropriate title and download message when installing SDK tools only. Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state. Add styles for the Studio download page.
am:
c607a4d
* commit '
c607a4d4d5f303d3ff139d752ccd69a7b2567aea':
Update modal download dialogs for sdk/ndk download. Revise the redirect behavior once download completes. Add more appropriate title and download message when installing SDK tools only. Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state. Add styles for the Studio download page.
Change-Id: Iac0edd81d0bcb710cf4c72d77ee457fbf06932b2
smain@google.com [Mon, 4 Apr 2016 23:17:01 +0000 (16:17 -0700)]
tweak the NDK download analytics event tag
Change-Id: I822d744f7f370330a26f0ff612de357dbe1005fe
Dirk Dougherty [Thu, 28 Jan 2016 16:32:47 +0000 (08:32 -0800)]
Update modal download dialogs for sdk/ndk download.
Revise the redirect behavior once download completes.
Add more appropriate title and download message when installing SDK tools only.
Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state.
Add styles for the Studio download page.
Change-Id: Ibc4ddb4a6130ab8bd8d6044472022465829f2000
Dirk Dougherty [Thu, 31 Mar 2016 23:21:45 +0000 (23:21 +0000)]
increment version for fetched js and cs files to avoid proxy caching.
am:
0d268be
* commit '
0d268bea3c497ff727c79dd5cec16dad354c5b32':
increment version for fetched js and cs files to avoid proxy caching.
Change-Id: If23aa04da44de5e55cd8f1ba5250a3174c1a6ed5
Dirk Dougherty [Thu, 31 Mar 2016 22:59:09 +0000 (15:59 -0700)]
increment version for fetched js and cs files to avoid proxy caching.
Change-Id: I427151284bf6777adb04e85b07b9b70355f8f7a2
Amanda Kassay [Thu, 31 Mar 2016 16:46:46 +0000 (16:46 +0000)]
Migrating web search api to custom search api on templates-sdk
am:
843649b
* commit '
843649bab10d2e6b8c9791132de7b6217dabed59':
Migrating web search api to custom search api on templates-sdk
Change-Id: I7f85542e8fd0534ac492e848c7b3070dc056cb43
Amanda Kassay [Thu, 17 Mar 2016 18:11:13 +0000 (14:11 -0400)]
Migrating web search api to custom search api on templates-sdk
akassay.nyc.corp.google.com:9000/#q=mobile
Change-Id: I71bdc7dbfede7bff0361ce00abef8081b852dd36
smain@google.com [Wed, 30 Mar 2016 21:34:48 +0000 (21:34 +0000)]
new search results layout. no more custom suggestions; just API matches and organic results.
am:
38b0e22
* commit '
38b0e22049346ad8955bdbb5b1927d1253dab273':
new search results layout. no more custom suggestions; just API matches and organic results.
Change-Id: I99278398150c173255c58c1be133766f1596e9f7
smain@google.com [Wed, 30 Mar 2016 21:34:48 +0000 (21:34 +0000)]
remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages
am:
1c8d4a4
* commit '
1c8d4a49e9c51ba1addfca8c86a535a0267ceba3':
remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages
Change-Id: I180df937382f6e9df50750e507ef0497b254a2e5
smain@google.com [Wed, 16 Mar 2016 18:30:53 +0000 (11:30 -0700)]
new search results layout.
no more custom suggestions; just API matches and organic results.
Change-Id: I6324aa6fb289f5d93aa701aecbd7fad64711d35f
smain@google.com [Sat, 27 Feb 2016 00:30:50 +0000 (16:30 -0800)]
remove dev guide search suggestions, move organic search results up.
tweak the search suggest for reference pages
Change-Id: I14e48fdac3f103dd998591886b91e5f6040b0f7a
Amanda Kassay [Wed, 30 Mar 2016 14:22:13 +0000 (14:22 +0000)]
Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer.
am:
e4a8ab1
* commit '
e4a8ab1a445a38a7b316513b1eac300d41eb49f7':
Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer.
Change-Id: I802ba805da249294433b5e1cc0a9563df1a1cdd4
Amanda Kassay [Tue, 29 Mar 2016 20:11:01 +0000 (16:11 -0400)]
Adding book metadata to doc head, fix tabs for content build,
fix for reference page double footer.
Change-Id: I8e721c60e21203b599779e31f48336d450a53fa3
smain@google.com [Tue, 22 Mar 2016 22:57:16 +0000 (15:57 -0700)]
increment docs.js version to force browser refresh.
needed to load recent fixes to the zippies.
Change-Id: Ifd14b99ea004b674f15558dc86371901adbe2375
smain@google.com [Wed, 16 Mar 2016 18:48:23 +0000 (11:48 -0700)]
update zippy icons to use material arrow (up/down instead of right/down).
fixes bug
27695580, which was caused because I previously
submitted an update to the code doclava templates to do this but
did not update the current site templates in kind.
Change-Id: I33a4ef90359838c02def90beb486e5a2dc21cbf7
David Friedman [Thu, 10 Mar 2016 01:59:03 +0000 (01:59 +0000)]
Merge "Docs: Change MD5 to SHA1 in NDK download table column heading" into mnc-mr-docs
David Friedman [Thu, 10 Mar 2016 01:58:08 +0000 (17:58 -0800)]
Docs: Change MD5 to SHA1 in NDK download table column heading
Change-Id: I0b70c86de855d609b45378c18dfb83830b944a28
smain@google.com [Wed, 9 Mar 2016 23:36:12 +0000 (15:36 -0800)]
change name of offline doc tab to "API reference"
and put the version number in the secondary nav bar (it was there anyway).
Change-Id: I4b49581eca6afa445a434cd6ae31572d01f276ef
Dirk Dougherty [Wed, 9 Mar 2016 22:07:31 +0000 (14:07 -0800)]
Fix broken suggestions for preview.
Change-Id: I1a13a3a9d9e38470ac040a37cdd04319bd6340e6
Scott Main [Wed, 9 Mar 2016 20:42:54 +0000 (20:42 +0000)]
Merge "Revert "Search for suggestion matches across PREVIEW_RESOURCES."" into mnc-mr-docs
Scott Main [Wed, 9 Mar 2016 20:42:29 +0000 (20:42 +0000)]
Revert "Search for suggestion matches across PREVIEW_RESOURCES."
This broke search suggestions.
This reverts commit
882adaed0e475b5ebd0ba81b5f1162b53f5e69f4.
Change-Id: I830339887955dfe86d502e54860d90ce59394d69
David Friedman [Wed, 9 Mar 2016 20:35:59 +0000 (20:35 +0000)]
Merge "Docs: Updates NDK download table for NDKr11" into mnc-mr-docs
David Friedman [Wed, 9 Mar 2016 20:31:17 +0000 (12:31 -0800)]
Docs: Updates NDK download table for NDKr11
Bug:
27167382
Change-Id: I11ef906f81c8a6e4951559952d4eeb383e7bf911
smain@google.com [Wed, 9 Mar 2016 19:57:39 +0000 (11:57 -0800)]
make image resource URLs relative so they work in offline docs
Change-Id: I4329689d8a3db3ce67f1aa7084a3a4634721e3cb
Joe Fernandez [Wed, 9 Mar 2016 07:57:29 +0000 (23:57 -0800)]
docs: Update DAC template to force refresh of resources
- incremented js and css resource references to =v18
b/
2753523
Change-Id: I43335732227662fea21c655a3ca67054bd828fe5
Scott Main [Tue, 8 Mar 2016 02:49:09 +0000 (02:49 +0000)]
Merge "Add new templates directory for "reference only" builds. The only difference is that this changes the masthead.cs file to show a different header." into mnc-mr-docs
smain@google.com [Tue, 8 Mar 2016 02:43:21 +0000 (18:43 -0800)]
Add new templates directory for "reference only" builds.
The only difference is that this changes the masthead.cs file to show a different header.
Change-Id: Id58eb7e8c42a8ab0886f2f5da794fcd108f299ff
Dirk Dougherty [Sat, 5 Mar 2016 02:46:54 +0000 (18:46 -0800)]
Add styles to compress the summary table presentation.
Change-Id: Icbb5da4c87bc111bfe7c5d29af4ad53546f11114
Dirk Dougherty [Thu, 3 Mar 2016 22:47:35 +0000 (14:47 -0800)]
Search for suggestion matches across PREVIEW_RESOURCES.
Change-Id: I8290aca2488a55da53905a658c98c0496709a8cb
Dirk Dougherty [Wed, 10 Feb 2016 02:00:05 +0000 (18:00 -0800)]
Add Preview to templates-sdk develop nav and global nav in templates-sdk-dev. Remove dependence on -includePreview.
Change-Id: I1456c3c94522f58c7d1c899ff96dd95cdc6ada7c
Amanda Kassay [Tue, 23 Feb 2016 21:49:11 +0000 (21:49 +0000)]
Merge "DAC DevSite template updates. Altered meta data in head section for navigation logic." into mnc-docs
Amanda Kassay [Tue, 23 Feb 2016 18:25:08 +0000 (13:25 -0500)]
DAC DevSite template updates. Altered meta data in head section for navigation logic.
Change-Id: Ib032229ff071abf7438a5f09245cac9c542b1f53
Scott Main [Fri, 19 Feb 2016 01:00:02 +0000 (01:00 +0000)]
Merge "increase top margin for reference H4s to increase readability. This is necessary now that the parameter lists are presented in tables." into mnc-docs
smain@google.com [Fri, 19 Feb 2016 00:56:48 +0000 (16:56 -0800)]
increase top margin for reference H4s to increase readability.
This is necessary now that the parameter lists are presented in tables.
Change-Id: Ibd7f3875b9823bb66309d2a5ed1acc188ede3ba4
Neil Fuller [Fri, 15 Jan 2016 16:35:54 +0000 (16:35 +0000)]
DevSite locale var update for hl url param.
Change-Id: I083009804d08246ffce4d4fe87fa9906ba5aaccc
smain@google.com [Tue, 9 Feb 2016 23:18:30 +0000 (15:18 -0800)]
move the parameter_list() method to macros_overrides
Change-Id: Ia8dcbc0cac478a9f89d90ec04a924c579bca3abb
smain@google.com [Sat, 6 Feb 2016 01:34:22 +0000 (17:34 -0800)]
Revise API reference templates to make them compatible
with both DAC and DevSite. Includes a variety of cleanup and redesign.
Now prints method parameters and return values even if not documented in source.
Now prints return value data type.
Now prints method name as heading without arguments, then the full signature below.
New heading styles with more spacing and removed background color.
Change-Id: I7a991df5e8d0d7ac8ff81c20b4b4692e67eb88aa
Dirk Dougherty [Sat, 6 Feb 2016 01:45:34 +0000 (01:45 +0000)]
Merge "Fix toggle icon in reference to match site-wide behavior." into mnc-docs
Dirk Dougherty [Sat, 6 Feb 2016 01:05:18 +0000 (17:05 -0800)]
Fix toggle icon in reference to match site-wide behavior.
Change-Id: I0743cd456210921c50777a37e2cf4580f79be64d
Amanda Kassay [Thu, 4 Feb 2016 14:58:35 +0000 (14:58 +0000)]
Merge "Full width search cover width bug fix." into mnc-docs
Neil Fuller [Wed, 25 Nov 2015 10:23:17 +0000 (10:23 +0000)]
Remove synchronized from the public API docs
The information is not useful. Javadoc hasn't included this
information for years.
Bug:
25767152
Change-Id: Ic0a398851b90fbf85785d5cf946e7f4c1aaa4be4
(cherry picked from commit
a37bdc89b47893f740ab652fe8b58c44e440f334)
Amanda Kassay [Wed, 3 Feb 2016 20:53:04 +0000 (15:53 -0500)]
Full width search cover width bug fix.
Change-Id: I32531f1096a41dc9949e5eb28105fa5ae56a4d3f
Dirk Dougherty [Sat, 30 Jan 2016 22:04:37 +0000 (14:04 -0800)]
Read sdk vars from centralized files. Fix a couple of issues in navigation labels and alignment.
Change-Id: I71da51cd20ac68ad6bc82cf8d9507cda965ec88b
Dirk Dougherty [Sat, 30 Jan 2016 19:07:01 +0000 (19:07 +0000)]
Merge "Read page-defined hdf vars for sdk from a central file." into mnc-docs
Dirk Dougherty [Fri, 29 Jan 2016 20:01:35 +0000 (12:01 -0800)]
Read page-defined hdf vars for sdk from a central file.
Change-Id: I3a38492c5ae44f810a720957291d7e94e1e7d8ea
Dirk Dougherty [Sat, 7 Nov 2015 19:34:59 +0000 (11:34 -0800)]
Rebased Updated templates, styles, scripts for dac.
Change-Id: Ida1a7f39cb6df0255f8f9c8e96a2270a0283c59e
Dirk Dougherty [Tue, 8 Dec 2015 22:49:52 +0000 (14:49 -0800)]
Update templates-sdk-dev to current templates-sdk.
Change-Id: I8c3da5a59d128ab5631c86737e3ede9c7f9b8deb
Dirk Dougherty [Fri, 20 Nov 2015 20:14:57 +0000 (12:14 -0800)]
Rescope bg image for summit to en landing page only. Increment metadata, js, css v args.
Change-Id: I468cefe39d6b021b68411f08f81fef5813df22ec
Dirk Dougherty [Thu, 19 Nov 2015 02:09:17 +0000 (18:09 -0800)]
Add image for dev summit banner.
Change-Id: I0bf233439723b9615d0e5c377a1dca3326c524ff
Bart Sears [Sun, 15 Nov 2015 18:02:33 +0000 (18:02 +0000)]
Revert "Change version back to 6.0" am:
55a149b740
am:
550b317688
* commit '
550b317688211118d8f2c50aaa80d2616903807b':
Revert "Change version back to 6.0"
Bart Sears [Sun, 15 Nov 2015 18:02:26 +0000 (18:02 +0000)]
Change version back to 6.0 am:
970f203b3d
am:
3a37a0cefd
* commit '
3a37a0cefd7599fa769fd86f7d64d781aaa88be7':
Change version back to 6.0
Bart Sears [Sun, 15 Nov 2015 17:59:44 +0000 (17:59 +0000)]
Revert "Change version back to 6.0"
am:
55a149b740
* commit '
55a149b74064b799efe9c69211a511725cb9925b':
Revert "Change version back to 6.0"
Bart Sears [Sun, 15 Nov 2015 17:59:32 +0000 (17:59 +0000)]
Change version back to 6.0
am:
970f203b3d
* commit '
970f203b3d3f17b778749c3ce47eb6b922aa606c':
Change version back to 6.0
Bart Sears [Sun, 15 Nov 2015 17:57:13 +0000 (17:57 +0000)]
Revert "Change version back to 6.0"
This reverts commit
970f203b3d3f17b778749c3ce47eb6b922aa606c.
Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
Bart Sears [Sun, 15 Nov 2015 07:50:18 +0000 (23:50 -0800)]
Change version back to 6.0
Temporarily set the version back to 6.0 and security patch to
2015-11-01.
Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
Vince Harron [Wed, 11 Nov 2015 19:37:38 +0000 (19:37 +0000)]
Switch emulator to generate userdebug images by default
am:
ba740ff57f
* commit '
ba740ff57fd314d0ad649c252841ab834e96fdaa':
Switch emulator to generate userdebug images by default
Vince Harron [Tue, 27 Oct 2015 23:08:25 +0000 (16:08 -0700)]
Switch emulator to generate userdebug images by default
This is primarily to avoid using the unsupported JIT on Android-M
It will increase app install times significantly because the app will
be compiled at install time. OTOH, It should improve application
performance dramatically.
Change-Id: Id1d637ec561db177fd52e4c111f4def2a1b45543
(cherry picked from commit
08787d747d71d7ff3f13d2275d937faefc6d7777)
Griff Hazen [Sun, 8 Nov 2015 01:00:58 +0000 (01:00 +0000)]
Let qemu_props service set system properties in ro.emu and ro.emulator
am:
20ed978ada
* commit '
20ed978ada07690b7ca6d643f6c8869e656ccff7':
Let qemu_props service set system properties in ro.emu and ro.emulator
Griff Hazen [Sun, 8 Nov 2015 00:44:44 +0000 (16:44 -0800)]
Let qemu_props service set system properties in ro.emu and ro.emulator
These boot properties are used by android wear emulator to configure
round and chin shaped devices.
Bug:
23324757
Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142
Zach Jang [Tue, 27 Oct 2015 00:52:13 +0000 (00:52 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev am:
54cb940c4a am:
dfd3524f7b
am:
eca2b655e5
* commit '
eca2b655e5a57f0a13c55d815f6b18d8d03160fb':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:48:30 +0000 (00:48 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev am:
54cb940c4a
am:
dfd3524f7b
* commit '
dfd3524f7b1fb2f0346eee7fa0dc42e8888f68aa':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
am:
54cb940c4a
* commit '
54cb940c4a07701212e96f77ee4a89493b0f251b':
Update security string to 2015-12-01
Zach Jang [Tue, 27 Oct 2015 00:37:40 +0000 (00:37 +0000)]
Merge "Update security string to 2015-12-01" into mnc-dev
Zach Jang [Tue, 27 Oct 2015 00:02:12 +0000 (00:02 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours am:
0e8cf97670 am:
07e2c19536
am:
a3b35dec78
* commit '
a3b35dec78b8afe7e29e3d6a0fc7524b5fd846a2':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:57:13 +0000 (23:57 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours am:
0e8cf97670
am:
07e2c19536
* commit '
07e2c195367119faa4645d3f9f0dcb1c6aba7396':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:52:50 +0000 (23:52 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157 am:
fe64ce145e -s ours
am:
0e8cf97670
* commit '
0e8cf97670c0b0a59d326507296829fe1bc01230':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:49:22 +0000 (23:49 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8 am:
cc9ac27157
am:
fe64ce145e -s ours
* commit '
fe64ce145e243fb3fde5a788bcd800c2987da37c':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:46:01 +0000 (23:46 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE am:
6575d4a2a8
am:
cc9ac27157
* commit '
cc9ac271575b4c1ef3a2bff3fbdaf2b201c6e75d':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Mon, 26 Oct 2015 23:42:57 +0000 (23:42 +0000)]
Update security string to 2015-12-01 - DO NOT MERGE
am:
6575d4a2a8
* commit '
6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
Update security string to 2015-12-01 - DO NOT MERGE
Zach Jang [Thu, 22 Oct 2015 22:03:14 +0000 (15:03 -0700)]
Update security string to 2015-12-01
Change-Id: I2e07d57e457effdcf685203dabfcfefa47c70bf3
Zach Jang [Thu, 22 Oct 2015 22:00:30 +0000 (15:00 -0700)]
Update security string to 2015-12-01 - DO NOT MERGE
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
Ian Pedowitz [Thu, 22 Oct 2015 21:59:20 +0000 (21:59 +0000)]
Bump Android to 6.0.1 am:
0a20c942c4
am:
1f9ba9f89e
* commit '
1f9ba9f89eacd2b16805cf138df16e211b51b700':
Bump Android to 6.0.1
Zach Jang [Thu, 22 Oct 2015 21:59:13 +0000 (21:59 +0000)]
Update security string to 2015-12-01 am:
0f1512bc03
am:
7b4c7fe5b7
* commit '
7b4c7fe5b77e55ede46f0b3fd5eb4a98964ff956':
Update security string to 2015-12-01
Ian Pedowitz [Thu, 22 Oct 2015 21:53:27 +0000 (21:53 +0000)]
Bump Android to 6.0.1
am:
0a20c942c4
* commit '
0a20c942c4bb110ebd971e7959ed1b2fa53e452a':
Bump Android to 6.0.1
Zach Jang [Thu, 22 Oct 2015 21:53:13 +0000 (21:53 +0000)]
Update security string to 2015-12-01
am:
0f1512bc03
* commit '
0f1512bc03b7820a2b9b93757a2309fb872f6677':
Update security string to 2015-12-01
Ian Pedowitz [Sat, 10 Oct 2015 18:00:52 +0000 (11:00 -0700)]
Bump Android to 6.0.1
Bug:
24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
Zach Jang [Tue, 20 Oct 2015 00:57:33 +0000 (17:57 -0700)]
Update security string to 2015-12-01
Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
Tao Bao [Sat, 17 Oct 2015 01:27:16 +0000 (01:27 +0000)]
am
1280fa01: am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
1280fa01bd263eac1d31850fe47f8e0aa93cab82':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:23:02 +0000 (01:23 +0000)]
am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
09ee6daa7f4d9a526532e77b45aa88bbf1f0776d':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:19:15 +0000 (01:19 +0000)]
am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
bc5e85afc9cbbbb3c7e7364a6ff2a29cfb596d38':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:15:39 +0000 (01:15 +0000)]
Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev
Tao Bao [Sat, 17 Oct 2015 00:18:27 +0000 (00:18 +0000)]
am
5631d5c6: am
46ae586a: am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
5631d5c6e12937fd50ef576c6cff1c7ed7c5ae1b':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.