LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,878 Commits 2 Branches 0 Tags
8ae03adcc1ae490c6ef1ee79bb203201ab4e45a6
Commit Graph

10878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
8ae03adcc1 am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs 
* commit '5fff297a34f2699a64a055700da4d3411e7c7ca2':
  Update platform SDK component to revision 5. [DO NOT MERGE]
 2014-07-18 22:31:44 +00:00
Deepanshu Gupta
5fff297a34 am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs 
* commit 'e2ee1baff8f1c0275e28ad4ccd5018545933a6e3':
  Update platform SDK component to revision 5. [DO NOT MERGE]
 2014-07-18 22:27:07 +00:00
Deepanshu Gupta
e2ee1baff8 resolved conflicts for merge of 6458c80c to jb-mr1.1-docs 
Change-Id: I8b4d344b4cf0004b377e0e9b08f3bbaf0a7641f0
 2014-07-18 15:17:44 -07:00
Deepanshu Gupta
6458c80c00 resolved conflicts for merge of 3baef70c to jb-mr1-dev 
Change-Id: I93a460f4ba7c9e2d8e417c53061072773f9ef9fd
 2014-07-18 15:00:58 -07: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
3baef70ca5 am 95da2621: Update platform SDK component to revision 5. [DO NOT MERGE] 
* commit '95da262195c8cc13c20d4b0bd70c87ae49046cf1':
  Update platform SDK component to revision 5. [DO NOT MERGE]
 2014-07-18 21:43:46 +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
95da262195 Update platform SDK component to revision 5. [DO NOT MERGE] 
Also update LayoutLib Api version.

Change-Id: Ifa357a964b8ed7c4f84c2162ddfb074e262ca69f
 2014-07-09 17:07:22 -07: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
e61fde7fae am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE] 
* commit 'bbfcdcc45ab63cdf22be404c89fbe0964191bd5b':
 2014-07-08 23:21:35 +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
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
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
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
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
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
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
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
0ea348a528 am 39ffbccd: Generalize support library tests. 
* commit '39ffbccdd4ab42922c9bdf0ec5d52ce1b21821f3':
  Generalize support library tests.
 2013-05-30 15:05:57 -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
Chet Haase
8654b6c6ac am 3ff1591c: am 28b127ec: New DevBytes animation demos 
* commit '3ff1591c5b1d90c876145b8a60dfc21cf93a0362':
  New DevBytes animation demos
 2013-05-30 15:02:07 -07:00
Chet Haase
3ff1591c5b am 28b127ec: New DevBytes animation demos 
* commit '28b127ec1e5af575a74af679a8542042112d177e':
  New DevBytes animation demos
 2013-05-30 15:00:20 -07:00
Jeff Sharkey
39ffbccdd4 Generalize support library tests. 
Change-Id: Icc147a16a90fbb83584424e239e40acc87de8328
 2013-05-30 14:28:43 -07:00
Chet Haase
28b127ec1e New DevBytes animation demos 
Change-Id: Ib475ddb109e0e62f0f085b6591ca15af0b79f75b
 2013-05-30 13:38:02 -07:00
Scott Main
6a0d35ed61 am 5ef71146: more redirects for deleted files 
* commit '5ef71146ce5df3d2838fadbd9c26875e0b2f9a7e':
  more redirects for deleted files
 2013-05-20 18:25:46 -07:00
Scott Main
5ef71146ce more redirects for deleted files 
Change-Id: I586b34871ad8e2dd7b2d3f3a417e01732a8d262b
 2013-05-20 18:18:09 -07:00
Scott Main
566d680917 am 42ba057a: redirect obsolete publishing files, as per removals from I715362c1dc7022581faf8653ec49da49b3c6ed4a 
* commit '42ba057a2352eb80ff64a0597a6b3ede38d54e50':
  redirect obsolete publishing files, as per removals from I715362c1dc7022581faf8653ec49da49b3c6ed4a
 2013-05-20 14:47:35 -07:00
Scott Main
42ba057a23 redirect obsolete publishing files, as per removals from I715362c1dc7022581faf8653ec49da49b3c6ed4a 
Change-Id: I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb
 2013-05-20 14:26:01 -07:00
Dirk Dougherty
5d37ab51d5 am fd81d9ec: am 6465f504: am 69abf615: Add redirects for edu urls. 
* commit 'fd81d9ec334759667347b171cf5793abc83ce8f2':
 2013-05-15 07:33:13 -07:00
Dirk Dougherty
fd81d9ec33 am 6465f504: am 69abf615: Add redirects for edu urls. 
* commit '6465f50405c552621bd1888bc32226892ae35cb7':
  Add redirects for edu urls.
 2013-05-15 07:32:01 -07:00