Commit Graph

11380 Commits

Author SHA1 Message Date
Deepanshu Gupta
197b278f1c am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '716666beaa0d8411781eebc89dc53a38155ca3dc':
2014-07-18 21:52:56 +00:00
Deepanshu Gupta
716666beaa am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit 'a9078f4a2b29713e3759c2cbdba8ebe3db0639c4':
2014-07-18 21:47:01 +00:00
Deepanshu Gupta
5837c83295 am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit 'a6da0ee8ca5b1b5ce0a9a4cbd576bcfb5d477516':
  Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:45:21 +00:00
Deepanshu Gupta
a9078f4a2b am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '7ee92e43446fe4f9c5f30e997afabe443719bca1':
  Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:42:35 +00:00
Deepanshu Gupta
a6da0ee8ca am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '7ee92e43446fe4f9c5f30e997afabe443719bca1':
  Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:39:30 +00:00
Deepanshu Gupta
7ee92e4344 Update platform SDK component to revision 3. [DO NOT MERGE]
Also update LayoutLib Api version.

Change-Id: Ic64a548d171891100f043c3e1a823db22b11e71e
2014-07-09 16:59:37 -07:00
Deepanshu Gupta
64d3ef3b02 am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit 'e61fde7faeeffbecb216f698fb156666bf071267':
2014-07-08 23:26:16 +00:00
Deepanshu Gupta
e61fde7fae am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit 'bbfcdcc45ab63cdf22be404c89fbe0964191bd5b':
2014-07-08 23:21:35 +00:00
Deepanshu Gupta
2277921695 am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '95ad5e383986b294b388507a28fff09d24aab0a3':
  Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:19:38 +00:00
Deepanshu Gupta
bbfcdcc45a am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '36b225169ab4ac6bcd59e685517fdc4bc2e8b420':
  Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:17:24 +00:00
Deepanshu Gupta
95ad5e3839 am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '36b225169ab4ac6bcd59e685517fdc4bc2e8b420':
  Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:17:11 +00:00
Deepanshu Gupta
36b225169a Package renamed fonts. [DO NOT MERGE]
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
(cherry picked from commit 35feaff496)
2014-06-12 16:16:04 -07:00
Deepanshu Gupta
5a65a7ab13 am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit '2613ee50778d138973c0df75b054b19bbee874be':
2014-05-02 19:16:05 +00:00
Deepanshu Gupta
b73c7b1244 am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'c0e290d39f8ae6d9d41b869001cb4390d8037df4':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:12:36 +00:00
Deepanshu Gupta
2613ee5077 am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit '19e61e5f528ade77831a7e3307cf213fc111341f':
2014-05-02 19:12:22 +00:00
Deepanshu Gupta
c0e290d39f am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'a5d913ab3789e552bdfcc0a2a6b9fb87d6f1b0ca':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:09:00 +00:00
Deepanshu Gupta
19e61e5f52 am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'a5d913ab3789e552bdfcc0a2a6b9fb87d6f1b0ca':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:08:45 +00:00
Deepanshu Gupta
a5d913ab37 Add ICU jar to SDK [DO NOT MERGE]
Bundle the ICU jar with the SDK.

Change-Id: I0773cee58b072f3bf60c2594b6dee251ef101cf0
(cherry picked from commit 79cc4f9212)
2014-05-02 11:59:11 -07:00
Dirk Dougherty
80f5024289 am d06f4e32: am 6ac22572: Update appengine server to handle \'@\'.
* commit 'd06f4e3287483de270c9ea7a19acdff24efa1cb0':
  Update appengine server to handle '@'.
2013-07-17 10:22:32 -07:00
Dirk Dougherty
d06f4e3287 am 6ac22572: Update appengine server to handle \'@\'.
* commit '6ac22572e589d4cab6f2015aa63212d4c7c2a903':
  Update appengine server to handle '@'.
2013-07-17 10:19:51 -07:00
Dirk Dougherty
6ac22572e5 Update appengine server to handle '@'.
Change-Id: Ic06686f94d8cff822808e30034b102e859833454
2013-07-17 10:08:27 -07:00
Dirk Dougherty
f3136431df am 6dcbcb7a: am 90b9ab16: Merge commit \'b1637825\' into manualmerge
* commit '6dcbcb7a539a7704672cc22dba3ac12cf5622b36':
  Adjust the redirects for edu and a couple others.
2013-06-26 11:05:13 -07:00
Dirk Dougherty
6dcbcb7a53 am 90b9ab16: Merge commit \'b1637825\' into manualmerge
* commit '90b9ab16f9f8730f69905f56055c5364d26ce888':
  Adjust the redirects for edu and a couple others.
2013-06-26 11:02:54 -07:00
Dirk Dougherty
90b9ab16f9 Merge commit 'b1637825' into manualmerge
Conflicts:
	scripts/app_engine_server/redirects.yaml

Change-Id: If68fc5e8461f3f9d63d00cc251e4bed2531d7025
2013-06-26 10:58:30 -07:00
Dirk Dougherty
b1637825c1 am 392804d0: Adjust the redirects for edu and a couple others.
* commit '392804d01ce967c5ec4d00b710c7664f42c3d736':
  Adjust the redirects for edu and a couple others.
2013-06-26 10:40:48 -07:00
Dirk Dougherty
392804d01c Adjust the redirects for edu and a couple others.
Change-Id: I95049ad68a4ecc31354f9e97e10d83114be8bb78
2013-06-26 10:34:59 -07:00
Robert Ly
61cf860801 am 58a0f1bc: am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '58a0f1bc860e6603970c5178294a7dd1709e9dad':
2013-06-17 09:57:56 -07:00
Robert Ly
6e58370c01 am 4d3ff06e: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '4d3ff06ef1fea7a18d04a013ec0e077ccf89394e':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:57:55 -07:00
Robert Ly
58a0f1bc86 am af5f663a: am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit 'af5f663ae05c86e52e0ff6cbe028748992118643':
2013-06-17 09:56:02 -07:00
Robert Ly
4d3ff06ef1 am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '5632947990326ebb2cd81e567e7b0d282672c2fd':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:55:14 -07:00
Robert Ly
af5f663ae0 am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '5632947990326ebb2cd81e567e7b0d282672c2fd':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:54:43 -07:00
Robert Ly
5632947990 am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '6bd35b5bd685355b673a36ed96b77ddd13a0bff4':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:52:40 -07:00
Robert Ly
6bd35b5bd6 Revert "make target for gms and gcm javadocs and to automate entire docs build"
This reverts commit 2deefec495.

Change-Id: I60be16d5233568a8ffcf6ec09952261b854275a8
2013-06-17 16:10:59 +00:00
Robert Ly
3d1ead8f39 am 2336733e: am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '2336733e7c8dc773b619e648b30b18f91fa6e952':
2013-06-13 15:40:33 -07:00
Robert Ly
ecd39491d7 am c3e7bbaf: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit 'c3e7bbaf00207bf36a2082cece68f7d6c0bf94af':
  make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:40:32 -07:00
Robert Ly
2336733e7c am 0e7706f3: am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '0e7706f3071b1edc4bd0af673c0ac44cbfe0cd71':
2013-06-13 15:37:06 -07:00
Robert Ly
c3e7bbaf00 am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '128c2f0265307ef5f36bd073148b46ef545db1c2':
  make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:36:30 -07:00
Robert Ly
0e7706f307 am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '128c2f0265307ef5f36bd073148b46ef545db1c2':
  make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:35:55 -07:00
Robert Ly
128c2f0265 am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '2deefec495526a521f16e4c0d6e19f2969462199':
  make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:34:14 -07:00
Robert Ly
2deefec495 make target for gms and gcm javadocs and to automate entire docs build
Change-Id: Iea7d17782f41c91e42a244bf8c67c30b64c43ede
2013-06-11 22:54:04 +00:00
Scott Main
64904ff823 am 8abfd5c1: am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
* commit '8abfd5c1b23bc6d941b38c2bff7285f9bb7a10bc':
  redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
2013-06-06 12:09:01 -07:00
Scott Main
8abfd5c1b2 am a0787146: redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
* commit 'a0787146674c12218a5891b5c2b36a2cffb74c56':
  redirect all UI guideline docs to Design docs except for widgets, pending b/9303742
2013-06-06 12:07:18 -07:00
Scott Main
a078714667 redirect all UI guideline docs to Design docs
except for widgets, pending b/9303742

Change-Id: I9b896e6c88701044f572ab79813d43c2f34b81b9
2013-06-05 20:46:59 -07:00
Chet Haase
9079a04c9e am 829b544e: am f04a0b09: am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos
* commit '829b544e4e26e7c425f49a52cebf2e6ada98d4f7':
2013-05-30 15:12:21 -07:00
Chet Haase
829b544e4e am f04a0b09: am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos
* commit 'f04a0b09a1b758356a928f7a3ed56333a02e691d':
2013-05-30 15:09:15 -07:00
Jeff Sharkey
29ca053ab3 am 0ea348a5: am 39ffbccd: Generalize support library tests.
* commit '0ea348a5288ac4368a9e7d435043d8af50ddc5e4':
  Generalize support library tests.
2013-05-30 15:09:02 -07:00
Jeff Sharkey
0ea348a528 am 39ffbccd: Generalize support library tests.
* commit '39ffbccdd4ab42922c9bdf0ec5d52ce1b21821f3':
  Generalize support library tests.
2013-05-30 15:05:57 -07:00
Chet Haase
9c6fb05ed8 am 58cbe71c: am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos
* commit '58cbe71cc434d787e54d3b3a1d7d86af9727857c':
  New DevBytes animation demos
2013-05-30 15:05:47 -07:00
Chet Haase
f04a0b09a1 am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos
* commit '8654b6c6ac430c285d9ad5bc7999a1c5390efa61':
  New DevBytes animation demos
2013-05-30 15:04:40 -07:00
Chet Haase
58cbe71cc4 am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos
* commit '8654b6c6ac430c285d9ad5bc7999a1c5390efa61':
  New DevBytes animation demos
2013-05-30 15:03:54 -07:00