tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12623 commits 1 branch 0 tags 119 MiB
Commit graph

12623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Carlstrom
1bcbf3593d am 71267677: resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp 
* commit '712676772b0d6e32bdce3430eed0a4d9771aac7e':
  Add OkHttp to the platform.
 2013-04-03 15:03:48 -07:00
Brian Carlstrom
712676772b resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp 
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
 2013-04-03 14:19:26 -07:00
Robert Ly
1e144f7d7b am fe15b4da: am ca957508: am f3840a2c: am 99532a5a: am ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 
* commit 'fe15b4dad3538fbcbdea3a09243a5f25d3718b3e':
  fix android build number in footer of gms and gcm reference
 2013-04-03 14:12:33 -07:00
Ulas Kirazci
b1753677f8 am 24242c60: am bde274ef: Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE. 
* commit '24242c60fbec32762608f6eecb91ba5a7d56d86d':
  Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
 2013-04-03 14:12:24 -07:00
Robert Ly
fe15b4dad3 am ca957508: am f3840a2c: am 99532a5a: am ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 
* commit 'ca957508015e841d5a6a4e582d73c6d779419561':
  fix android build number in footer of gms and gcm reference
 2013-04-03 14:06:51 -07:00
Ulas Kirazci
24242c60fb am bde274ef: Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE. 
* commit 'bde274ef83b9e22365205a7cd320e13bc53ae625':
  Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
 2013-04-03 14:03:22 -07:00
Robert Ly
ca95750801 am f3840a2c: am 99532a5a: am ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 
* commit 'f3840a2c2c614a271c8678fb65fc4a6148f41744':
  fix android build number in footer of gms and gcm reference
 2013-04-03 14:01:54 -07:00
Robert Ly
f3840a2c2c am 99532a5a: am ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 
* commit '99532a5aeabe3d55fa99407e948782a6dcf15e5e':
  fix android build number in footer of gms and gcm reference
 2013-04-03 13:58:38 -07:00
Robert Ly
99532a5aea am ad027032: am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 
* commit 'ad027032b11f592cc58286f535e087053b0220f0':
  fix android build number in footer of gms and gcm reference
 2013-04-03 13:56:04 -07:00
Robert Ly
ad027032b1 am e046ede5: am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 
* commit 'e046ede5350affd49268d35692b5142d1471381d':
  fix android build number in footer of gms and gcm reference
 2013-04-03 13:54:00 -07:00
Robert Ly
e046ede535 am 3eba74ff: am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 
* commit '3eba74ffc1f2a542a0d0376215fb6d2711e7639c':
  fix android build number in footer of gms and gcm reference
 2013-04-03 13:52:06 -07:00
Robert Ly
3eba74ffc1 am ddde20b6: Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 
* commit 'ddde20b67c521fbd7ad090f7a1e4ab3f69865b4f':
  fix android build number in footer of gms and gcm reference
 2013-04-03 13:48:35 -07:00
Robert Ly
ddde20b67c Merge "fix android build number in footer of gms and gcm reference" into jb-mr1-dev 2013-04-03 20:38:55 +00:00
Ulas Kirazci
bde274ef83 Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE. 
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
 2013-04-03 13:37:07 -07:00
Ying Wang
5ec66d1542 Merge "Add OkHttp to the platform." 2013-04-03 19:31:24 +00:00
jwilson
190dde0b1a Add OkHttp to the platform. 
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
 2013-04-02 16:24:04 -07:00
Scott Main
149d075774 am 758a22b5: am 248a9dd4: am baa0023b: am 2e5602cd: am 70174c67: am 07e13f7c: am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as a 
* commit '758a22b503dabc6ca8761afa97bed7f6a5c60db7':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
 2013-04-02 14:21:11 -07:00
Scott Main
758a22b503 am 248a9dd4: am baa0023b: am 2e5602cd: am 70174c67: am 07e13f7c: am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms 
* commit '248a9dd4c91a4ca9d2410b976eab79521b97d0df':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
 2013-04-02 13:59:08 -07:00
Scott Main
248a9dd4c9 am baa0023b: am 2e5602cd: am 70174c67: am 07e13f7c: am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is 
* commit 'baa0023b9f1e5cbc3cfa0c39ea5893cd68d5a981':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
 2013-04-02 13:55:59 -07:00
Scott Main
baa0023b9f am 2e5602cd: am 70174c67: am 07e13f7c: am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into n 
* commit '2e5602cd6251d7669f5adc9ccda3a5451a0195bd':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
 2013-04-02 13:51:52 -07:00
Scott Main
2e5602cd62 am 70174c67: am 07e13f7c: am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav. 
* commit '70174c6783f85d105157f2b2207a3d459e966237':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
 2013-04-02 13:47:47 -07:00
Scott Main
70174c6783 am 07e13f7c: am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav. 
* commit '07e13f7c25d22ac30a59b10feebf92a3d2df6e02':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
 2013-04-02 13:44:22 -07:00
Scott Main
07e13f7c25 am f614554d: load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav. 
* commit 'f614554daed6b8fe1ff646136a28c8090474b39e':
  load google API navtree ondemand (remove request from <head>). Also move the code for highlighting the sidenav into a separate method that we can call at a later time, such as after the gms reference is loaded into nav.
 2013-04-02 13:40:05 -07:00
Ben Murdoch
772a4f6099 am 3e572762: am 0646fdae: Fix SDK build. 
* commit '3e5727623a19c1daed4be62cb2a31c7c29eb5ff6':
  Fix SDK build.
 2013-04-02 11:04:34 -07:00
The Android Open Source Project
7f8c1e4eed am f518b598: Reconcile with jb-mr2-release - do not merge 
* commit 'f518b5982edc0fa8fb916f38e52ce54c56d6a11d':
  JWR01B
  JWR01
  JWQ87E
  JWQ87D
 2013-04-02 11:04:12 -07:00
Jeff Brown
4a00745f15 am b528116b: am dd243370: apicheck: Suppress certain changes in final qualifier. 
* commit 'b528116bba0e690f620ee2a150560ce8217490de':
  apicheck: Suppress certain changes in final qualifier.
 2013-04-02 11:03:40 -07:00
Ben Murdoch
3e5727623a am 0646fdae: Fix SDK build. 
* commit '0646fdae6714e651c55b8e1ef33fc54e28ece454':
  Fix SDK build.
 2013-04-02 10:28:21 -07:00
Ben Murdoch
0646fdae67 Fix SDK build. 
Ensure that we include the Chromium-WebView resources.

Change-Id: I3f7b4e52ebb59fa6a8952839bb071c7994505b75
 2013-04-02 18:20:50 +01:00
The Android Open Source Project
f518b5982e Reconcile with jb-mr2-release - do not merge 
Change-Id: I60878364265a0889aaa0d1f32e709b9a4e632636
 2013-04-02 08:39:21 -07:00
Jeff Brown
b528116bba am dd243370: apicheck: Suppress certain changes in final qualifier. 
* commit 'dd243370f509115a9e3bd263dcf31e74ae448bd5':
  apicheck: Suppress certain changes in final qualifier.
 2013-04-02 08:24:12 -07:00
Wink Saville
69babbdc38 am 061604bd: am 0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE." 
* commit '061604bdadd797a5371248c177e77c942c2c44f6':
  Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
 2013-04-01 18:04:14 -07:00
Wink Saville
061604bdad am 0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE." 
* commit '0262d0f74725f8a165b20eeac323cdd8ca31df03':
  Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
 2013-04-01 18:02:06 -07:00
Wink Saville
0262d0f747 Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE." 2013-04-02 00:43:39 +00:00
Scott Main
f614554dae load google API navtree ondemand (remove request from <head>). 
Also move the code for highlighting the sidenav into a separate method
that we can call at a later time, such as after the gms reference is loaded into nav.

Change-Id: I924d68b2b9dbfed83f81d1fd418e06b6c79a9010
 2013-04-01 16:38:11 -07:00
The Android Automerger
6f59ed8551 JWR01B 2013-04-01 16:29:47 -07:00
Jeff Brown
dd243370f5 apicheck: Suppress certain changes in final qualifier. 
It is safe for a class to become final if it was not previously
instantiable since applications could not declare subclasses
of their own.

Likewise it is always safe to remove final.

Change-Id: I9a72fee7b25ccceca2024112812b97872ba2ec6b
 2013-04-01 14:24:49 -07:00
Ying Wang
f94ace13bd am 6686497b: am 51f7dcb9: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev 
* commit '6686497ba38eec4b1ec62fc40b25b111a3653643':
  Default install path of shared Java library with tag tests
 2013-04-01 12:06:02 -07:00
Ying Wang
6686497ba3 am 51f7dcb9: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev 
* commit '51f7dcb9adb60c91bf85d3148c841efa2b3a14f2':
  Default install path of shared Java library with tag tests
 2013-04-01 12:03:46 -07:00
Ying Wang
51f7dcb9ad Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev 2013-04-01 19:00:13 +00:00
The Android Automerger
e75ce2635f JWR01 2013-04-01 05:57:34 -07:00
The Android Automerger
746f433b1c merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-01 05:55:15 -07:00
Ying Wang
3f33b9e00c am 0f7e0694: am a1fd8e44: Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools" 
* commit '0f7e0694a575fa4472f43e6a4e11c053ff99d69b':
  Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
 2013-03-29 19:19:49 -07:00
Ying Wang
0f7e0694a5 am a1fd8e44: Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools" 
* commit 'a1fd8e44b71a83f2733258b020c4057af3c4046a':
  Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
 2013-03-29 19:18:38 -07:00
Ying Wang
a1fd8e44b7 Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools" 2013-03-30 01:20:27 +00:00
Ying Wang
564f912223 Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools 
Change-Id: Ia3647674f294c42e9fbe2163bf0d70012313bb15
 2013-03-29 17:40:14 -07:00
The Android Automerger
6221e8a202 JWQ87E 2013-03-29 16:18:48 -07:00
Raph Levien
cbdfc8ee7f am a1eb76ae: am 59fa08bd: Merge "Switch Indic fonts to Noto" into jb-mr2-dev 
* commit 'a1eb76aeb6d3df64b960ad47b60f408765c52069':
  Switch Indic fonts to Noto
 2013-03-29 14:35:15 -07:00
The Android Automerger
387e52240d JWQ87D 2013-03-29 14:03:26 -07:00
Raph Levien
a1eb76aeb6 am 59fa08bd: Merge "Switch Indic fonts to Noto" into jb-mr2-dev 
* commit '59fa08bd3c624be9ea06789b70c22b483df612c4':
  Switch Indic fonts to Noto
 2013-03-29 10:44:17 -07:00
Raph Levien
59fa08bd3c Merge "Switch Indic fonts to Noto" into jb-mr2-dev 2013-03-29 17:43:08 +00:00