Deepanshu Gupta
54c50b59d5
am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'd67beb9aa9dfd4db1b12bcf932492acac221df04':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:48:49 +00:00
Deepanshu Gupta
d67beb9aa9
am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit 'dbea3d7d5eba6b149a08325036ab353eb385ef66':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:44:43 +00:00
Deepanshu Gupta
dbea3d7d5e
am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '53e1237a8edbad2de948f55b13df596853ae578f':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:39:44 +00:00
Deepanshu Gupta
53e1237a8e
am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
...
* commit '8ae03adcc1ae490c6ef1ee79bb203201ab4e45a6':
Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:35:08 +00:00
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
a20f555a25
am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'f5838d2491807833ca963b98d5aed802d9c5d128':
2014-07-18 22:05:35 +00:00
Deepanshu Gupta
1b0b90c5b3
am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '385f3bb6c4dfd2e630b64c6afdde69507eef5d8c':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 22:05:34 +00: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
f5838d2491
am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'f26c608bf020a0ab93d549d7e483930fe1e7b00f':
2014-07-18 22:00:39 +00:00
Deepanshu Gupta
385f3bb6c4
am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'c5a8318a78f40087ae564753fa57167cbb12af46':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:57:08 +00:00
Deepanshu Gupta
f26c608bf0
am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '197b278f1cb1b55a15c8e2100faf42313989352c':
2014-07-18 21:56:55 +00:00
Deepanshu Gupta
c5a8318a78
am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '5837c832955cfe06cec00d8c1daf2c7effc50b0f':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:53:26 +00:00
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
e377c65b60
am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit 'd4402051282b976a1bd40000a61e1bed996c6ea9':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:45:21 +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
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
d440205128
am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
...
* commit '7f724995d9c4140f6432de4c9bdda8716d8e6059':
Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:39:27 +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
7f724995d9
Update platform SDK component to revision 3. [DO NOT MERGE]
...
Also update LayoutLib Api version.
Change-Id: Id28d8441dbcf2bbe19c6d11efb0d100c344d558e
2014-07-09 16:57:29 -07:00
Deepanshu Gupta
fdafffee7c
am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit 'af01e43fefa45b5bf327128221ca268e6e20a9eb':
2014-07-08 23:44:33 +00:00
Deepanshu Gupta
af01e43fef
am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '4564b18ac8b85c4deee7e80b308dc29817515551':
2014-07-08 23:40:06 +00:00
Deepanshu Gupta
635276658a
am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '8a0254eef573275a234820c6e61526b17dbc77ca':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:32:58 +00:00
Deepanshu Gupta
4564b18ac8
am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '64d3ef3b0294be71cb05af07f5691166fa804cc1':
2014-07-08 23:30:11 +00:00
Deepanshu Gupta
8a0254eef5
am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '618ccb2b061d9c6caeaea879d889e4a709a5a470':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:28:17 +00: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
1066b88723
am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
...
* commit '7ad693d1d8180ce3650bb2a80c15d5f4ec853311':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:23:55 +00:00
Deepanshu Gupta
618ccb2b06
am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
...
* commit '2277921695e1b9d396c1daec877c2ec2c142476e':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:23:32 +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
7ad693d1d8
am 35feaff4: Package renamed fonts. [DO NOT MERGE]
...
* commit '35feaff4962ef76c8cc1a1d79350804715f7f3d0':
Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:19:48 +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
35feaff496
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 edf631dee4
2014-06-12 16:09:54 -07:00
Deepanshu Gupta
9761e9c2ad
am 1f492924: am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '1f492924c4353ddd8fcdcf700b103f7e59c43bac':
2014-05-02 19:26:47 +00:00
Deepanshu Gupta
1f492924c4
am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '40cab5153e4ab36f70096bba7ff7a60fd40d4ed3':
2014-05-02 19:24:01 +00:00
Deepanshu Gupta
5f00e19500
am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '48ed332b5aff2b4dbd472bb8c1f44dfb949ced77':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:23:11 +00:00
Deepanshu Gupta
48ed332b5a
am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'b866a59170206edc25f33dca28ee7f037050cc7f':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:20:09 +00:00
Deepanshu Gupta
40cab5153e
am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit '5a65a7ab1359a809516d0a93a273b1fe5944858d':
2014-05-02 19:19:54 +00:00
Deepanshu Gupta
b866a59170
am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
...
* commit 'b73c7b1244f8de87ee0f38308266508790e3eca5':
Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:16:20 +00: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
