LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,568 Commits 2 Branches 0 Tags
e44f214eccb259c2d136800ae173f8e5c2c66f37
Commit Graph

12568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Siva Velusamy
86f685daf2 Merge "Add frameworks/tools to windows SDK whitelist" 2013-08-29 22:01:54 +00: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
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
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
Joe Fernandez
bb6c10123f Merge "Sample code for OpenGL Android training class" 2013-08-23 17:50:31 +00:00
Tom O'Neill
7db79b3548 Inject more settings for better testing of SettingsInjector 
- Test fix for b/10447517

Change-Id: Ifc579026a34d559093bb06f820d439a0876208b3
 2013-08-23 09:55:34 -07:00
Yohann Roussel
779320c0b3 Merge "Include android-support-multidex in SDK libs." 2013-08-23 12:56:04 +00:00
Jeff Brown
12a303dc37 am 008bfa74: (-s ours) am cfa9cd0d: am 582f50f2: (-s ours) am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) 
* commit '008bfa744317aad92f1deb3de63f46767e97d45c':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)
 2013-08-22 20:39:29 -07:00
Jeff Brown
008bfa7443 am cfa9cd0d: am 582f50f2: (-s ours) am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) 
* commit 'cfa9cd0d85bb46cf2a47be8b0e137b3c3102bd02':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)
 2013-08-22 20:36:20 -07:00
Jeff Brown
cfa9cd0d85 am 582f50f2: (-s ours) am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) 
* commit '582f50f2f6d4c1cf9a7ea5da9326aea157b0db3d':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)
 2013-08-22 20:34:41 -07:00
Jeff Brown
582f50f2f6 am 9299c6cd: Ensure sample runs on Gingerbread. (DO NOT MERGE) 
* commit '9299c6cdd8e5d084ef4c10e5b7f044e0ea590641':
  Ensure sample runs on Gingerbread.  (DO NOT MERGE)
 2013-08-22 20:28:01 -07:00
Jeff Brown
9299c6cdd8 Ensure sample runs on Gingerbread. (DO NOT MERGE) 
Unfortunately, the video does not play due to a MediaPlayer
exception but at least this version does not crash.

Change-Id: I0baf9239a8a12f92b4805bab226f21f46fa63693
(cherry picked from commit 854e16afda)
 2013-08-23 03:23:46 +00:00
Jeff Brown
f277681ec5 am 22a994d1: am 854e16af: Ensure sample runs on Gingerbread. 
* commit '22a994d112ecd11254a948b4e976b9e09e22d3f7':
  Ensure sample runs on Gingerbread.
 2013-08-22 20:13:58 -07:00
Jeff Brown
22a994d112 am 854e16af: Ensure sample runs on Gingerbread. 
* commit '854e16afda1bbacbd5eee7e434059d493879497d':
  Ensure sample runs on Gingerbread.
 2013-08-22 20:11:55 -07:00
Jeff Brown
854e16afda Ensure sample runs on Gingerbread. 
Unfortunately, the video does not play due to a MediaPlayer
exception but at least this version does not crash.

Change-Id: I0baf9239a8a12f92b4805bab226f21f46fa63693
 2013-08-22 18:25:58 -07:00
Brett Chabot
9ec1ad312a am 859cff17: am c518764b: Merge "Fix runtest cts-net" into klp-dev 
* commit '859cff17af79fa36215d775c3dc38f02871ad1a5':
  Fix runtest cts-net
 2013-08-22 11:13:08 -07:00
Brett Chabot
859cff17af am c518764b: Merge "Fix runtest cts-net" into klp-dev 
* commit 'c518764b02d4b99b06400dd1903019b1f44a78bf':
  Fix runtest cts-net
 2013-08-22 11:06:36 -07:00
Brett Chabot
c518764b02 Merge "Fix runtest cts-net" into klp-dev 2013-08-22 18:00:37 +00:00
Baligh Uddin
04ebf8a0dd Merge "Import translations. DO NOT MERGE" 2013-08-22 17:49:43 +00:00
Brett Chabot
315d72f730 Fix runtest cts-net 
Change-Id: Ia3f7e058c48a8c84e465602e1af172ba75ff1154
 2013-08-22 10:26:52 -07:00
Joe Fernandez
66f6fe6633 Sample code for OpenGL Android training class 
( Original Id: Ib1650025a3c4b018c60d70ede3f25113660f68d8 )

Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241
 2013-08-22 10:25:33 -07:00
Brett Chabot
2be8802d48 am ab53bde8: am dfc82ebe: Merge "Find install artifacts using GET-INSTALL-PATH." into klp-dev 
* commit 'ab53bde8911e7f6e32e6f6652ae2af9f1be3e35f':
  Find install artifacts using GET-INSTALL-PATH.
 2013-08-21 20:16:15 -07:00
Brett Chabot
ab53bde891 am dfc82ebe: Merge "Find install artifacts using GET-INSTALL-PATH." into klp-dev 
* commit 'dfc82ebe7db366e6e3b717fc1d9d60edd6e1c8c8':
  Find install artifacts using GET-INSTALL-PATH.
 2013-08-21 20:11:26 -07:00