Deepanshu Gupta
|
1fa56befff
|
am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '3271adb9958beaf3d9651d6a6e1406731d12306f':
Update platform SDK component to revision 3. [DO NOT MERGE]
|
2014-07-18 22:15:20 +00:00 |
|
Deepanshu Gupta
|
5b6f4fc6e0
|
am a20f555a: (-s ours) 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 'a20f555a255918ac0c6a366352dece8732232eb8':
|
2014-07-18 22:10:09 +00:00 |
|
Deepanshu Gupta
|
3271adb995
|
am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '1b0b90c5b3a277c2d3c798232beab4776253e2fe':
Update platform SDK component to revision 3. [DO NOT MERGE]
|
2014-07-18 22:10:08 +00:00 |
|
Deepanshu Gupta
|
6b014b7966
|
am 25337462: am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '2533746207287c806f46fa6bb3339965fac25a36':
Update platform SDK component to revision 3. [DO NOT MERGE]
|
2014-07-18 22:07:48 +00: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
|
2533746207
|
am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit 'ab4bad872a7a03e3ab4164252942fa227ca4f1cc':
Update platform SDK component to revision 3. [DO NOT MERGE]
|
2014-07-18 22:02:32 +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
|
ab4bad872a
|
am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '8a4e0831b1144b9d809306c56a0bd387342dcb15':
Update platform SDK component to revision 3. [DO NOT MERGE]
|
2014-07-18 21:57:46 +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
|
8a4e0831b1
|
am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit 'e377c65b608b096b438b3d4edf71351bf481593a':
Update platform SDK component to revision 3. [DO NOT MERGE]
|
2014-07-18 21:52:54 +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
|
a6131422fd
|
am 82b828e1: Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev
* commit '82b828e178eef7b0da6325f4f2cb39c0b5b68cef':
Update platform SDK component to revision 2. [DO NOT MERGE]
|
2014-07-18 21:40:08 +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
|
82b828e178
|
Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev
|
2014-07-17 21:09:48 +00:00 |
|
Elliott Hughes
|
95f5ef2a12
|
am e72af215: am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
* commit 'e72af21577c139a8d466da9b826dbd33528e0d9b':
Fix testrunner's reference to icu4c.
|
2014-07-10 00:21:54 +00:00 |
|
Elliott Hughes
|
e72af21577
|
am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
* commit '8de48e23757c14cacb0a53be4f26e9e9e927e429':
Fix testrunner's reference to icu4c.
|
2014-07-10 00:16:45 +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
|
50cee5e265
|
Update platform SDK component to revision 2. [DO NOT MERGE]
Also update LayoutLib Api version.
Change-Id: I2ceca3d669919ca417b11d4cfb61c35177a46566
|
2014-07-09 16:55:17 -07:00 |
|
Elliott Hughes
|
8de48e2375
|
Merge "Fix testrunner's reference to icu4c."
|
2014-07-09 22:27:32 +00:00 |
|
Elliott Hughes
|
4e491e4359
|
Fix testrunner's reference to icu4c.
I don't know why this has a reference to icu4c.
Change-Id: I36c21b54e6bc4866141a86350ea82ff7903c79a3
|
2014-07-09 17:13:48 -07:00 |
|
Tony Wickham
|
39ae7d2216
|
am 542963ee: Merge "Added _index.html and screenshots to all samples." into klp-modular-dev
* commit '542963ee685d063419b15e9afd4a32b063a08337':
Added _index.html and screenshots to all samples.
|
2014-07-09 17:23:21 +00:00 |
|
Deepanshu Gupta
|
9dabcc8d47
|
am fc3efcd2: am d6ce63a3: am 6bd8a043: am fdafffee: (-s ours) am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit 'fc3efcd286655c27ab823674045ef672a17a5a84':
|
2014-07-09 00:01:56 +00:00 |
|
Deepanshu Gupta
|
fc3efcd286
|
am d6ce63a3: am 6bd8a043: am fdafffee: (-s ours) am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit 'd6ce63a380e611719bbb817f0edd5433f3bbc483':
|
2014-07-08 23:58:18 +00:00 |
|
Deepanshu Gupta
|
d6ce63a380
|
am 6bd8a043: am fdafffee: (-s ours) am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '6bd8a043a4c22082fb8bcc75806f3b28009f3c51':
|
2014-07-08 23:54:06 +00:00 |
|
Deepanshu Gupta
|
3eb60fc331
|
am e851bb15: am bc4103e3: am 17bed4f4: am 63527665: (-s ours) am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit 'e851bb15fffbefc90224df76ea5874cce1ed47fb':
Package renamed fonts. [DO NOT MERGE]
|
2014-07-08 23:50:16 +00:00 |
|
Deepanshu Gupta
|
6bd8a043a4
|
am fdafffee: (-s ours) am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit 'fdafffee7c167ac08146251a0fda7d869feda56b':
|
2014-07-08 23:48:54 +00:00 |
|
Deepanshu Gupta
|
e851bb15ff
|
am bc4103e3: am 17bed4f4: am 63527665: (-s ours) am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit 'bc4103e3abcef871ca3677364827ca561fce7685':
Package renamed fonts. [DO NOT MERGE]
|
2014-07-08 23:46:00 +00: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
|
b79abe56ec
|
am 6721a877: am 6aaa1ebb: am 2f5a06e4: am 1066b887: (-s ours) am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
* commit '6721a87704a7b9fd223e02a7007223a0a4b39cd5':
Package renamed fonts. [DO NOT MERGE]
|
2014-07-08 23:42:53 +00:00 |
|
Deepanshu Gupta
|
bc4103e3ab
|
am 17bed4f4: am 63527665: (-s ours) am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '17bed4f4db4efa9cb8bfbaceb72bf9a7919a5510':
Package renamed fonts. [DO NOT MERGE]
|
2014-07-08 23:41:06 +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
|
6721a87704
|
am 6aaa1ebb: am 2f5a06e4: am 1066b887: (-s ours) am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
* commit '6aaa1ebb4f0416f5cf7899b658c691965429ede8':
Package renamed fonts. [DO NOT MERGE]
|
2014-07-08 23:38:18 +00:00 |
|
Deepanshu Gupta
|
17bed4f4db
|
am 63527665: (-s ours) am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '635276658a37fe0a60380155c50e594447ba7e19':
Package renamed fonts. [DO NOT MERGE]
|
2014-07-08 23:37:15 +00:00 |
|
Deepanshu Gupta
|
6aaa1ebb4f
|
am 2f5a06e4: am 1066b887: (-s ours) am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
* commit '2f5a06e48b130c0ee9bd9d236fe043ef8bd53fe0':
Package renamed fonts. [DO NOT MERGE]
|
2014-07-08 23:33:14 +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 |
|
Tony Wickham
|
542963ee68
|
Merge "Added _index.html and screenshots to all samples." into klp-modular-dev
|
2014-07-08 23:31:34 +00:00 |
|
Tony Wickham
|
ab63d27944
|
Added _index.html and screenshots to all samples.
Bug 15814554
Change-Id: Icdb08c5cc39f97c88674e4177b88b47adce59127
|
2014-07-08 19:48:23 -07: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 |
|