Commit Graph

13366 Commits

Author SHA1 Message Date
The Android Automerger 2393c84aff merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-09 05:55:12 -07:00
Dirk Dougherty 9b825319cb am ae3be8a5: am 8c01be68: am ccc15faf: am 56811475: am 5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit 'ae3be8a5f4df872a149cbfc537e315cbb6bc592b':
  Doc change: Move butterbar css to template assets.
2013-07-08 17:42:22 -07:00
Dirk Dougherty ae3be8a5f4 am 8c01be68: am ccc15faf: am 56811475: am 5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '8c01be686cacb593677dd1a753c132e58aa87661':
  Doc change: Move butterbar css to template assets.
2013-07-08 17:37:50 -07:00
Jeff Brown 9977ddf0cd Revert "Remove mediarouter v7 support library from SDK."
This reverts commit 0eacd936b7.

Bug: 9425325
Change-Id: Idf81e6721fb4361a38ffd73d39c574c2cb2b1155
2013-07-09 00:35:00 +00:00
Dirk Dougherty 8c01be686c am ccc15faf: am 56811475: am 5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit 'ccc15faf56ad46f973800cb6bd41b4634b9192a0':
  Doc change: Move butterbar css to template assets.
2013-07-08 17:33:58 -07:00
Dirk Dougherty ccc15faf56 am 56811475: am 5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '56811475202ededf0c76bf9b28d3e27d5761d747':
  Doc change: Move butterbar css to template assets.
2013-07-08 17:32:03 -07:00
Dirk Dougherty 5681147520 am 5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '5386532e03bbc76bcdf8a76877ef460bfe764925':
  Doc change: Move butterbar css to template assets.
2013-07-08 17:29:54 -07:00
Dirk Dougherty 5386532e03 Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev 2013-07-09 00:28:40 +00:00
Dirk Dougherty 4c2dfcfd6d Doc change: Move butterbar css to template assets.
Change-Id: Ifa116fe304150c7c663b8088e00349ffdc69017c
2013-07-08 16:05:05 -07:00
Scott Main 91c62aef19 am c9e0fac8: am 7672ccb3: am fb2bb3d8: am 51852a3f: am 8c0f5b3a: enable download box style for qv sidebox
* commit 'c9e0fac8dcc25ec84b285042af9156c6660002ae':
  enable download box style for qv sidebox
2013-07-08 15:33:42 -07:00
The Android Open Source Project 676897e697 am 7e1b93cb: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '7e1b93cbd5b647db496cc587c90a012af0529dff':
  "JSS08"
2013-07-08 15:33:42 -07:00
Scott Main c9e0fac8dc am 7672ccb3: am fb2bb3d8: am 51852a3f: am 8c0f5b3a: enable download box style for qv sidebox
* commit '7672ccb3d7ae6153c86bdd69a48db7e87e445c27':
  enable download box style for qv sidebox
2013-07-08 15:32:53 -07:00
The Android Open Source Project 7e1b93cbd5 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ifa6e38073ef648695efea3b895ef1fb64d39471e
2013-07-08 15:31:01 -07:00
Scott Main 7672ccb3d7 am fb2bb3d8: am 51852a3f: am 8c0f5b3a: enable download box style for qv sidebox
* commit 'fb2bb3d867fcdd3add7e30d1cbb6b956d3fce89e':
  enable download box style for qv sidebox
2013-07-08 15:28:53 -07:00
Scott Main fb2bb3d867 am 51852a3f: am 8c0f5b3a: enable download box style for qv sidebox
* commit '51852a3fc1120fdad1f309613439e9b42e497318':
  enable download box style for qv sidebox
2013-07-08 15:27:50 -07:00
Scott Main 51852a3fc1 am 8c0f5b3a: enable download box style for qv sidebox
* commit '8c0f5b3aefac3c824155cf883e61b021a6d8fd8f':
  enable download box style for qv sidebox
2013-07-08 15:25:55 -07:00
Scott Main 8c0f5b3aef enable download box style for qv sidebox
Change-Id: I209e9971d886e45498aab0b4d43241ded5285f24
2013-07-08 15:12:02 -07:00
Lorenzo Colitti a553ea1eb1 am a6e97a31: am b1b758f5: Don\'t build clatd without clatd.conf.
* commit 'a6e97a31df26b3e9062e9ab5342e8fd6070ffb0b':
  Don't build clatd without clatd.conf.
2013-07-08 14:33:12 -07:00
Lorenzo Colitti a6e97a31df am b1b758f5: Don\'t build clatd without clatd.conf.
* commit 'b1b758f5bf30d1c6f5b0c0d5599bbe6a91d541f9':
  Don't build clatd without clatd.conf.
2013-07-08 14:31:05 -07:00
Lorenzo Colitti b1b758f5bf Don't build clatd without clatd.conf.
Bug: 9730936
Change-Id: I2c50422c7b502d5b9bdc01afb55d25353f6c7088
2013-07-09 01:54:40 +09:00
The Android Automerger 2145e71b10 "JSS08" 2013-07-08 05:56:31 -07:00
The Android Automerger 2f2483dc21 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-08 05:55:19 -07:00
Lorenzo Colitti f0be96575b Don't build clatd without clatd.conf.
Bug: 9730936
Change-Id: Id9ddf5541e894852eda8c471b9931c7c8bbbdc0a
2013-07-08 19:43:42 +09:00
The Android Open Source Project a5b5291d58 am 5d915283: (-s ours) Reconcile with jb-mr2-deb-factory-release - do not merge
* commit '5d915283a1beeadb2d50da20b2864d8493a9c8d6':
  JCR78H
2013-07-03 14:12:35 -07:00
The Android Open Source Project 5d915283a1 Reconcile with jb-mr2-deb-factory-release - do not merge
Change-Id: I8cef01a88b58eb33c82f6f6080d43490847fc377
2013-07-03 14:10:21 -07:00
The Android Automerger 9a397bb24e JCR78H 2013-07-03 12:33:56 -07:00
The Android Open Source Project a0d420848a am dcaf8c34: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'dcaf8c340a18f6d2a848fc23e57b63404052ce2a':
  JWR66T
2013-07-03 08:06:32 -07:00
The Android Open Source Project dcaf8c340a Reconcile with jb-mr2-release - do not merge
Change-Id: I04a3eda1cc82e255fe06d697a783f61d4f8ebf21
2013-07-03 07:37:08 -07:00
The Android Automerger 245240803a JWR66T 2013-07-02 19:04:53 -07:00
The Android Open Source Project 88b5608380 am 585332c9: (-s ours) Reconcile with jb-mr2-release jb-mr2-deb-factory-release jb-mr2-zeroday-release - do not merge
* commit '585332c9e4ea588ccb310c6fa8b1137c6a6086be':
  JSS02B
  "JSS02"
  JCR78G
  "JWR66S"
  JCR78F
  JCR78E
2013-07-02 12:41:24 -07:00
The Android Open Source Project 585332c9e4 Reconcile with jb-mr2-release jb-mr2-deb-factory-release jb-mr2-zeroday-release - do not merge
Change-Id: Iae120841f91c3c12600a6f993c498f292f1cf0b2
2013-07-02 12:33:17 -07:00
The Android Automerger 0b001bdbb1 JSS02B 2013-07-02 11:57:14 -07:00
The Android Automerger a8c7c0f922 "JSS02" 2013-07-02 05:56:01 -07:00
The Android Automerger 1f13c2f2ab merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-02 05:55:12 -07:00
The Android Automerger b5eab6a2ec JCR78G 2013-07-01 21:19:39 -07:00
The Android Automerger afc26fabcf "JWR66S" 2013-07-01 18:04:27 -07:00
The Android Open Source Project d696456943 am 29344bdf: (-s ours) Reconcile with jb-mr2-deb-factory-release - do not merge
* commit '29344bdfd9c130fdb012f7687122828b2073741a':
  JCR78D
2013-07-01 17:01:20 -07:00
The Android Automerger 4ea75a30e6 JCR78F 2013-07-01 16:57:31 -07:00
The Android Automerger 56391a1728 JCR78E 2013-07-01 16:46:19 -07:00
The Android Open Source Project 29344bdfd9 Reconcile with jb-mr2-deb-factory-release - do not merge
Change-Id: I3331bb9b846bc698339f8ce6bcf33b37d92a8074
2013-07-01 15:59:13 -07:00
Baligh Uddin 2d08cc61ea JCR78D 2013-07-01 15:11:53 -07:00
The Android Open Source Project 7c3910069b am 4886cf51: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '4886cf512df8ee5a0f60063b1a74ffddb20d2aa6':
  "JSS01"
  "JSR91"
  JSR88C
  "JWR66R"
  JSR88B
2013-07-01 07:44:19 -07:00
The Android Open Source Project 4886cf512d Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Icaf1734bf56551758a818c0b3bbbda7a7eda0924
2013-07-01 07:42:15 -07:00
The Android Automerger 6666776df2 "JSS01" 2013-07-01 05:56:00 -07:00
The Android Automerger 6f6bdf0920 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-01 05:55:09 -07:00
The Android Automerger b97ce8cd15 "JSR91" 2013-06-30 05:56:26 -07:00
The Android Automerger aab7f30276 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-30 05:55:13 -07:00
The Android Automerger 30d8a24740 JSR88C 2013-06-28 14:57:23 -07:00
The Android Automerger f8dfc3e560 "JWR66R" 2013-06-28 14:36:04 -07:00
Ying Wang bdaa42311f am f755fa0d: (-s ours) am d235ed2a: Respect DISABLE_PROGUARD
* commit 'f755fa0d8c46a907aa457c55a8164141975467da':
  Respect DISABLE_PROGUARD
2013-06-28 13:47:15 -07:00