Commit Graph

12841 Commits

Author SHA1 Message Date
Ying Wang ced0e1b834 Switch to prebuilt bison
Bug: 8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
2013-04-05 18:35:51 -07:00
Ying Wang eccc9a5723 am adf3e7fb: am 854be683: Switch to prebuilt bison
* commit 'adf3e7fb301eaddecdd949f83a3e4cf288635879':
  Switch to prebuilt bison
2013-04-05 18:29:16 -07:00
Ying Wang adf3e7fb30 am 854be683: Switch to prebuilt bison
* commit '854be683636892eed455100d0c20b0f7dd8c5076':
  Switch to prebuilt bison
2013-04-05 18:25:57 -07:00
Ying Wang 854be68363 Switch to prebuilt bison
Bug: 8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
2013-04-05 18:02:16 -07:00
Dianne Hackborn 4acd27dfb3 Add new media command to build.
Change-Id: I3c32924b0c6400aa22221646f8e118a66f65f628
2013-04-05 17:05:06 -07:00
The Android Automerger 34145be850 JWR04C 2013-04-05 15:14:45 -07:00
Ed Heyl c4c1711d5d JER05
Change-Id: Ice879d6d5884c4193e65e1445c3e077fe7151650
2013-04-05 09:14:18 -07:00
The Android Automerger 05cd2f8ff4 JWR04B 2013-04-04 16:25:30 -07:00
The Android Automerger cfddab2d5c "JWR04" 2013-04-04 05:57:18 -07:00
The Android Automerger 323b344d76 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-04 05:55:10 -07:00
The Android Open Source Project 76d09fb76a am d503fa85: Reconcile with jb-mr2-release - do not merge
* commit 'd503fa85deaf4c14d27f45c1408ed13f302f36f4':
  "JWR03"
  JWR02B
  "JWR02"
2013-04-03 18:05:25 -07:00
The Android Automerger 0860d95d2d JWR03B 2013-04-03 17:02:56 -07:00
The Android Open Source Project d503fa85de Reconcile with jb-mr2-release - do not merge
Change-Id: If59d4eea208050457ffe142edea2aa28385e3aa3
2013-04-03 16:43:07 -07:00
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
The Android Automerger 8d47f1f81b "JWR03" 2013-04-03 06:03:57 -07:00
The Android Automerger 996ba4838b merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-03 06:02:06 -07:00
The Android Automerger 4981e545c6 JWR02B 2013-04-02 16:55:26 -07: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 Automerger 577e518025 "JWR02" 2013-04-02 09:19:59 -07:00
The Android Automerger 1360a8d963 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-02 09:18:12 -07: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