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
|
dd0fcf2f83
|
am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '9f1005fdbe41f842708884801f9c313cf87a0cde':
|
2014-07-18 22:38:42 +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
|
9f1005fdbe
|
am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '84e3386eb261b45db60090c8cb8a7c8df0fa0660':
|
2014-07-18 22:34:54 +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
|
84e3386eb2
|
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:29 +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 |
|
Chris Craik
|
644678f99b
|
Update Outline API
Change-Id: Ia9a4ce9e50473f4c1ee46fe40506c6a9736043a7
|
2014-07-18 15:26:29 -07:00 |
|
Deepanshu Gupta
|
2aad5082c4
|
am 2cdeb60c: am a2c022fa: am 5b6f4fc6: 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 '2cdeb60c3a98c1ceb8208f641f8df9f988a84f20':
|
2014-07-18 22:25:31 +00:00 |
|
Deepanshu Gupta
|
d898a214c0
|
am 591f5c8b: am 1fa56bef: 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 '591f5c8b14d1760cc8b11dd3f2a1b7715e279f43':
Update platform SDK component to revision 3. [DO NOT MERGE]
|
2014-07-18 22:25:30 +00:00 |
|
Deepanshu Gupta
|
2cdeb60c3a
|
am a2c022fa: am 5b6f4fc6: 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 'a2c022fa211e62e2f2007ed35b3024b9792af1b3':
|
2014-07-18 22:20:18 +00:00 |
|
Deepanshu Gupta
|
591f5c8b14
|
am 1fa56bef: 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 '1fa56befffded934f1101760a279b2ff8e55f655':
Update platform SDK component to revision 3. [DO NOT MERGE]
|
2014-07-18 22:20:17 +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
|
a2c022fa21
|
am 5b6f4fc6: 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 '5b6f4fc6e00c5a77691e0a413d83b29ec34ea59a':
|
2014-07-18 22:15:21 +00:00 |
|
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 |
|
Youngsang Cho
|
aa78cabf7b
|
am 3ee98b1a: Merge "AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()" into lmp-dev
* commit '3ee98b1ad055494ae09fe1e951aacf8aa7bbb909':
AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()
|
2014-07-18 19:00:13 +00:00 |
|
Youngsang Cho
|
3ee98b1ad0
|
Merge "AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()" into lmp-dev
|
2014-07-18 18:24:25 +00:00 |
|
Ying Wang
|
059adfb37a
|
am 90b2bdae: Merge "3rd attempt to build and store android_system.jar in sdk builds." into lmp-dev
* commit '90b2bdae91cc008b5b5827066e02905398b24e7c':
3rd attempt to build and store android_system.jar in sdk builds.
|
2014-07-18 16:27:49 +00:00 |
|
Yohann Roussel
|
4f19aae797
|
am 96489645: am e15f6511: Merge "Move multidex support library"
* commit '96489645aba1b3241b10baab6c927c069e48a877':
Move multidex support library
|
2014-07-18 13:29:31 +00:00 |
|
Yohann Roussel
|
1b45a1d964
|
am a7aa5e0e: (-s ours) am 2d2ce1b6: Merge "Add res folder to multidex SDK projects."
* commit 'a7aa5e0e866a0a6c82e8673d642be490aeecc0f1':
Add res folder to multidex SDK projects.
|
2014-07-18 13:29:30 +00:00 |
|
Yohann Roussel
|
bf04e111a6
|
am 8a8f2488: (-s ours) am 93b72e47: Merge "android-support-multidex-instrumentation in SDK."
* commit '8a8f24886df8d6c25bb27f79fdac204695f058b2':
android-support-multidex-instrumentation in SDK.
|
2014-07-18 13:23:55 +00:00 |
|
Yohann Roussel
|
0a76d3d7da
|
am b8db294e: (-s ours) am c854c636: Merge "Add multidex ADT project to SDK."
* commit 'b8db294e23c68fbb387455820e0f777b68ea66f0':
Add multidex ADT project to SDK.
|
2014-07-18 13:17:49 +00:00 |
|
Yohann Roussel
|
955c407204
|
am 7ec33a7c: (-s ours) am 0d1b03f1: Merge "Include android-support-multidex in SDK libs."
* commit '7ec33a7cf3c6719b4a607ff62796d64886bd2d6e':
Include android-support-multidex in SDK libs.
|
2014-07-18 13:08:38 +00:00 |
|
Wonsik Kim
|
92dc4e5b46
|
am 859cc5f0: Merge "Adjust to onCreateSession() method signature change" into lmp-dev
* commit '859cc5f0e69f79ab5c628ad0b49b1cddd4cf5c69':
Adjust to onCreateSession() method signature change
|
2014-07-18 11:40:43 +00:00 |
|
Ying Wang
|
572a5b7b20
|
am 38bf922a: Merge ""sdk" is not necessarily on the linux command line." into lmp-dev
* commit '38bf922ac10c400522514a2b7af1024ef413ebf9':
"sdk" is not necessarily on the linux command line.
|
2014-07-18 11:40:39 +00:00 |
|
Yohann Roussel
|
96489645ab
|
am e15f6511: Merge "Move multidex support library"
* commit 'e15f6511b7a86622dbc63392830ecd61df4da6e0':
Move multidex support library
|
2014-07-18 10:55:29 +00:00 |
|
Yohann Roussel
|
a7aa5e0e86
|
am 2d2ce1b6: Merge "Add res folder to multidex SDK projects."
* commit '2d2ce1b6c3d8dc221ac783103b116ce8dcdfd7e2':
Add res folder to multidex SDK projects.
|
2014-07-18 10:55:27 +00:00 |
|
Yohann Roussel
|
8a8f24886d
|
am 93b72e47: Merge "android-support-multidex-instrumentation in SDK."
* commit '93b72e4703204b1ba15929a9b30e5b2ec3febfa5':
android-support-multidex-instrumentation in SDK.
|
2014-07-18 10:55:26 +00:00 |
|