LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,145 Commits 2 Branches 0 Tags
ba5eec0601dbbaf04064eefa16b45ab8884c8e90
Commit Graph

13145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
1b18de6980 am bc178c1f: am 72c6392c: Merge "eclipse classpath: add external/hamcrest (used by mockito)" into klp-dev 
* commit 'bc178c1f766c06f96ea2ac24eb719ba7449223b5':
  eclipse classpath: add external/hamcrest (used by mockito)
 2013-09-03 17:50:02 -07:00
Igor Murashkin
bc178c1f76 am 72c6392c: Merge "eclipse classpath: add external/hamcrest (used by mockito)" into klp-dev 
* commit '72c6392c13e4d03f4bb4db7fd1ee3b580bcc21c2':
  eclipse classpath: add external/hamcrest (used by mockito)
 2013-09-03 17:47:45 -07:00
Igor Murashkin
72c6392c13 Merge "eclipse classpath: add external/hamcrest (used by mockito)" into klp-dev 2013-09-04 00:44:51 +00:00
Tom O'Neill
19372f3cb5 am b2d341fd: am de6b8986: Merge "Adapt to API constant changes" into klp-dev 
* commit 'b2d341fdee4072517a7e8f4af259bfe1a2101915':
  Adapt to API constant changes
 2013-09-03 13:34:38 -07:00
Tom O'Neill
b2d341fdee am de6b8986: Merge "Adapt to API constant changes" into klp-dev 
* commit 'de6b89866cf0785c2285ed85ad40b054f2cca692':
  Adapt to API constant changes
 2013-09-03 13:31:59 -07:00
Tom O'Neill
de6b89866c Merge "Adapt to API constant changes" into klp-dev 2013-09-03 20:26:24 +00:00
Xavier Ducrohet
28a61656ab am 6889aabb: (-s ours) am 06f88fa1: am fc54e384: (-s ours) am a179e05f: am 1bd3e863: Fix build-tools version. do not merge. 
* commit '6889aabbd8aba4e03f70d7d78f9dd184f0c1bc26':
  Fix build-tools version. do not merge.
 2013-09-03 12:22:59 -07:00
Xavier Ducrohet
6889aabbd8 am 06f88fa1: am fc54e384: (-s ours) am a179e05f: am 1bd3e863: Fix build-tools version. do not merge. 
* commit '06f88fa1d1f139a5e6b4cba355a760c1c43b1eed':
  Fix build-tools version. do not merge.
 2013-09-03 12:14:56 -07:00
Xavier Ducrohet
06f88fa1d1 am fc54e384: (-s ours) am a179e05f: am 1bd3e863: Fix build-tools version. do not merge. 
* commit 'fc54e384c1c84977bbb036195a6d76e7b35b2501':
  Fix build-tools version. do not merge.
 2013-09-03 12:12:51 -07:00
Xavier Ducrohet
fc54e384c1 am a179e05f: am 1bd3e863: Fix build-tools version. do not merge. 
* commit 'a179e05f4dc79e937c463ed6e5e746734edf0a9f':
  Fix build-tools version. do not merge.
 2013-09-03 12:10:27 -07:00
Xavier Ducrohet
a179e05f4d am 1bd3e863: Fix build-tools version. do not merge. 
* commit '1bd3e86304e6501b430df893b0155490f6579348':
  Fix build-tools version. do not merge.
 2013-09-03 12:09:29 -07:00
Xavier Ducrohet
1bd3e86304 Fix build-tools version. do not merge. 
Change-Id: I28bc6fe53b8cf92fde49845c7fc0ffeccf58b937
 2013-09-03 12:04:38 -07:00
Yohann Roussel
a9dd9cfb71 Merge "Add multidex ADT project to SDK." 2013-09-02 11:50:41 +00:00
Andrew Hsieh
e66254552e Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies." 2013-08-31 03:04:07 +00:00
Hak Matsuda
fe38a988cd Add NDK sample to demonstrate more OpenGL&Gaming related technologies. 
Change-Id: I0fb56c1fd1aa82d5a7c4da5010e00e103146ba78
 2013-08-30 19:42:02 -07:00
Xavier Ducrohet
e44f214ecc am 057d8177: (-s ours) am 61c7ea8e: am a9068afa: (-s ours) am fd8979ff: am f01dda32: Update platform revision. DO NOT MERGE. 
* commit '057d8177e0d55c09ea4a902316a3ba04c5d29e98':
  Update platform revision. DO NOT MERGE.
 2013-08-30 17:31:16 -07:00
Xavier Ducrohet
057d8177e0 am 61c7ea8e: am a9068afa: (-s ours) am fd8979ff: am f01dda32: Update platform revision. DO NOT MERGE. 
* commit '61c7ea8e1e0496910aee457b2ca08028899c302d':
  Update platform revision. DO NOT MERGE.
 2013-08-30 17:29:14 -07:00
Xavier Ducrohet
61c7ea8e1e am a9068afa: (-s ours) am fd8979ff: am f01dda32: Update platform revision. DO NOT MERGE. 
* commit 'a9068afa3cb338d9949a3a78d6062e58b2dbdb71':
  Update platform revision. DO NOT MERGE.
 2013-08-30 17:26:20 -07:00
Xavier Ducrohet
a9068afa3c am fd8979ff: am f01dda32: Update platform revision. DO NOT MERGE. 
* commit 'fd8979ff310f051df51931ab90c1540f15ab8714':
  Update platform revision. DO NOT MERGE.
 2013-08-30 10:21:52 -07:00
Xavier Ducrohet
fd8979ff31 am f01dda32: Update platform revision. DO NOT MERGE. 
* commit 'f01dda325b859f8c481dd434ce748c1c1558f8c0':
  Update platform revision. DO NOT MERGE.
 2013-08-30 10:18:26 -07:00
Xavier Ducrohet
f01dda325b Update platform revision. DO NOT MERGE. 
Change-Id: Id49c7f47e81b000255de8eb8a02d1c74146bfdad
 2013-08-30 10:13:32 -07:00
Andrew Hsieh
aa8d49c7f7 am 35a69bf7: am bd58d761: am 19c6555d: Merge "Update NDK\'s android headers" 
* commit '35a69bf73898dfc66b6c8c569bf12524bf82b9ed':
  Update NDK's android headers
 2013-08-29 18:29:37 -07:00
Andrew Hsieh
35a69bf738 am bd58d761: am 19c6555d: Merge "Update NDK\'s android headers" 
* commit 'bd58d761074cf88df09f10d7a07e0ed8dd470ae0':
  Update NDK's android headers
 2013-08-29 18:27:41 -07:00
Andrew Hsieh
bd58d76107 am 19c6555d: Merge "Update NDK\'s android headers" 
* commit '19c6555d9deed3fb77ac2a76b2861e49542533c9':
  Update NDK's android headers
 2013-08-29 18:24:50 -07:00
Andrew Hsieh
19c6555d9d Merge "Update NDK's android headers" 2013-08-30 01:23:01 +00:00
Michael Wright
f3c3a93bc4 Update NDK's android headers 
Change-Id: I2ae3b42dcbbdccbcae018f768dc7b56723416d21
 2013-08-29 18:17:46 -07:00
Tom O'Neill
3e01427b42 Adapt to API constant changes 
- Affects b/10461474

Change-Id: I08bf5e1bd389428233638b1a19ec06a10393380f
 2013-08-29 15:40:10 -07:00
Siva Velusamy
86f685daf2 Merge "Add frameworks/tools to windows SDK whitelist" 2013-08-29 22:01:54 +00:00
Igor Murashkin
8ac27eff4e eclipse classpath: add external/hamcrest (used by mockito) 
This fixes the "The hierarchy of the type is inconsistent" error
when using ArgumentMatcher from Mockito.

Change-Id: Ic5e74c7f7020a610fdb1c061a7eb3ecb4c487438
 2013-08-29 10:51:35 -07:00
Mike Lockwood
cd10458c78 Add frameworks/tools to windows SDK whitelist 
Change-Id: Id418a8784339183bd6b8f5a0abb88b877b9b4ad7
 2013-08-29 08:38:13 -07:00
Baligh Uddin
e3cf504891 Merge "Import translations. DO NOT MERGE" 2013-08-29 14:48:43 +00:00
Baligh Uddin
abe977a1a0 Import translations. DO NOT MERGE 
Change-Id: I2fab6ac7f7c64a96d376945e3ab8efdccb4e9dcc
Auto-generated-cl: translation import
 2013-08-28 23:19:16 -07:00
Baligh Uddin
a9f7a86162 Import translations. DO NOT MERGE 
Change-Id: I7996cb16804cff5e38cd1559d939e3c481cb8a10
Auto-generated-cl: translation import
 2013-08-28 23:10:52 -07:00
The Android Automerger
5c3e54e1eb merge in klp-release history after reset to klp-dev 2013-08-28 06:00:19 -07:00
Baligh Uddin
f7117b8ac6 Merge "Import translations. DO NOT MERGE" 2013-08-28 02:33:18 +00:00
Baligh Uddin
fe90fe7079 Merge "Import translations. DO NOT MERGE" 2013-08-28 02:32:30 +00:00
Tom O'Neill
a05612a244 am 1073385f: am ed92f012: Merge "Test case where SettingsInjectorService.getStatus() errors out" into klp-dev 
* commit '1073385f866a59797cb5d7dbac988f2ba08e753c':
  Test case where SettingsInjectorService.getStatus() errors out
 2013-08-27 10:30:30 -07:00
Tom O'Neill
1073385f86 am ed92f012: Merge "Test case where SettingsInjectorService.getStatus() errors out" into klp-dev 
* commit 'ed92f0123a23efa10c802a9023f51f46a2dcf2c1':
  Test case where SettingsInjectorService.getStatus() errors out
 2013-08-27 07:42:53 -07:00
Tom O'Neill
ed92f0123a Merge "Test case where SettingsInjectorService.getStatus() errors out" into klp-dev 2013-08-27 14:40:23 +00:00
The Android Automerger
843cefc2c0 merge in klp-release history after reset to klp-dev 2013-08-27 06:01:05 -07:00
Chong Zhang
515d41ee4b am 424603a9: am 3e3d973c: am 21e0c25e: am 184f79db: Support7Demo: fix video playback on GB 
* commit '424603a99e216f28d61d5baf87a95b5f61a86f46':
  Support7Demo: fix video playback on GB
 2013-08-26 15:18:25 -07:00
Tom O'Neill
04dcb46e22 am 6154b800: am 7db79b35: Inject more settings for better testing of SettingsInjector 
* commit '6154b800a9520bcaa4391dc9eff24e912bf7f41f':
  Inject more settings for better testing of SettingsInjector
 2013-08-26 15:18:25 -07:00
Chong Zhang
424603a99e am 3e3d973c: am 21e0c25e: am 184f79db: Support7Demo: fix video playback on GB 
* commit '3e3d973c48a5d13ac616b92e70c186c2c6eab128':
  Support7Demo: fix video playback on GB
 2013-08-26 15:04:07 -07:00
Tom O'Neill
6154b800a9 am 7db79b35: Inject more settings for better testing of SettingsInjector 
* commit '7db79b35483922a07a3a144dd3354b1f0d0cc9b3':
  Inject more settings for better testing of SettingsInjector
 2013-08-26 15:03:55 -07:00
Baligh Uddin
df1f9ce180 Import translations. DO NOT MERGE 
Change-Id: I55f373813538f3b5bebf25d3fd0dcdd39cd57b42
Auto-generated-cl: translation import
 2013-08-26 13:43:04 -07:00
Baligh Uddin
56cbe9c89c Import translations. DO NOT MERGE 
Change-Id: Ie512b29bb84649dd88a44f896c7e5bf667c45413
Auto-generated-cl: translation import
 2013-08-26 13:36:27 -07:00
Tom O'Neill
f534ba3a12 Test case where SettingsInjectorService.getStatus() errors out 
- Also adapt to SettingsInjectorService intent rename

- Part of fix to b/10461474

Change-Id: If35325868ddd730924c4bb1c4543f31017e039f9
 2013-08-26 10:06:56 -07:00
Chong Zhang
3e3d973c48 am 21e0c25e: am 184f79db: Support7Demo: fix video playback on GB 
* commit '21e0c25efb54e5081434c1db07f55ed87ad4cd50':
  Support7Demo: fix video playback on GB
 2013-08-26 09:29:57 -07:00
Chong Zhang
21e0c25efb am 184f79db: Support7Demo: fix video playback on GB 
* commit '184f79db44846b492e2b8b3785b5b62df1f22479':
  Support7Demo: fix video playback on GB
 2013-08-26 09:28:22 -07:00
Chong Zhang
184f79db44 Support7Demo: fix video playback on GB 
Change-Id: I2d403832d82428746dd3ccdbe0cfd56315d72ed9
(cherry picked from commit dbcc746cb0d727ac9aed60bb4156b3bf9f4668aa)
 2013-08-26 16:25:45 +00:00