OSDN Git Service
Alan Viverette [Mon, 3 Feb 2014 23:31:54 +0000 (15:31 -0800)]
am
8b725dcb: Merge "Improve encapsulation of Resources"
* commit '
8b725dcbe15761514eea680c119bcc83a290c0f0':
Improve encapsulation of Resources
Chris Wren [Mon, 3 Feb 2014 23:31:50 +0000 (15:31 -0800)]
am
5c57c44e: Merge "record the notification style"
* commit '
5c57c44eea02ec579dc24cedfe417d487ba71fce':
record the notification style
Chris Craik [Mon, 3 Feb 2014 23:31:47 +0000 (15:31 -0800)]
am
494db9e4: Merge "Simplify umbra calculation"
* commit '
494db9e4bbf206025336aee9dfece93639686e44':
Simplify umbra calculation
Chris Craik [Mon, 3 Feb 2014 23:31:44 +0000 (15:31 -0800)]
am
1d89563f: Merge "Add initial hidden outline APIs"
* commit '
1d89563ff8f5afd77457ef58489a234f490b480c':
Add initial hidden outline APIs
Narayan Kamath [Mon, 3 Feb 2014 23:31:40 +0000 (15:31 -0800)]
am
90b8eaa6: am
797b5adc: am
77a1986c: am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
90b8eaa68bda6beaf2ff886c3ed642e7050e3ff6':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Mon, 3 Feb 2014 23:31:38 +0000 (15:31 -0800)]
am
8396b56e: am
d49babe5: (-s ours) am
9af95574: am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
8396b56e0a12d97c7933afca3813c356c18a8f38':
Change ResourceType cookies to int32_t.
Narayan Kamath [Mon, 3 Feb 2014 23:31:35 +0000 (15:31 -0800)]
am
fd6a44d0: am
ff62e966: am
149510e0: am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
fd6a44d0b5b6bcfc606abf23520b316c4bf36fc4':
Fixed cancel() not working correctly
Igor Murashkin [Mon, 3 Feb 2014 23:31:32 +0000 (15:31 -0800)]
am
5ec133b9: am
ed5d7a6f: am
4463a4ef: am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
5ec133b9a0949cda92c5c287169aba86ad615065':
EGL14.eglCreateWindowSurface should set producerControlledByApp
George Mount [Mon, 3 Feb 2014 23:31:28 +0000 (15:31 -0800)]
am
56f57ccb: Revert "Add Path trimming."
* commit '
56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334':
Revert "Add Path trimming."
Zhijun He [Mon, 3 Feb 2014 23:31:23 +0000 (15:31 -0800)]
am
10586ad2: am
4f840dd1: am
5901ddeb: am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
10586ad2a6996b8f9f84ed47a65ccc2d883fc19f':
Narayan Kamath [Mon, 3 Feb 2014 23:31:19 +0000 (15:31 -0800)]
am
b9fd12ac: am
dfd1aa43: resolved conflicts for merge of
2cd0563c to klp-modular-dev-plus-aosp
* commit '
b9fd12ac53a35800753d54c4c0a825c261267c29':
Narayan Kamath [Mon, 3 Feb 2014 23:31:14 +0000 (15:31 -0800)]
am
3a5e4705: am
5cdbac1e: (-s ours) am
70986e19: am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
3a5e470553a1a42647850b7c642f96961c2e4587':
Narayan Kamath [Mon, 3 Feb 2014 23:31:10 +0000 (15:31 -0800)]
am
13701e48: am
133c9649: am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
13701e4822d15e67bca1919ea1317312908f0bea':
Evan Charlton [Mon, 3 Feb 2014 22:58:21 +0000 (14:58 -0800)]
resolved conflicts for merge
54b100ce
Nick Kralevich [Mon, 3 Feb 2014 22:09:59 +0000 (14:09 -0800)]
am
cb6979ac: am
643be3ba: am
3dfa15c4: am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
cb6979acf9794a30ede4b888a078b728c913bb16':
Narayan Kamath [Mon, 3 Feb 2014 22:09:54 +0000 (14:09 -0800)]
am
acda9614: Merge "Change ResourceType cookies to int32_t."
* commit '
acda961446f52b555d9c38757a68b5b15d26fd0b':
Change ResourceType cookies to int32_t.
Zhijun He [Mon, 3 Feb 2014 22:09:45 +0000 (14:09 -0800)]
am
5901ddeb: am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
5901ddeb525ed7691c382e8d17f47055d7d1e5db':
Release locked buffer when it fails to acquire graphics buffer
Brian Carlstrom [Mon, 3 Feb 2014 18:11:48 +0000 (10:11 -0800)]
Merge commit '
2cd0563c' into mm
Narayan Kamath [Fri, 31 Jan 2014 23:12:34 +0000 (15:12 -0800)]
am
70986e19: (-s ours) am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
70986e197bbaf4de4f8126519a75df2b057c3b52':
AArch64: Use of long for pointers in PropertyValuesHolder
Narayan Kamath [Fri, 31 Jan 2014 22:05:33 +0000 (14:05 -0800)]
am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
fa2e16e36d95d5cf0848a28a98ac4566321fc119':
change Surface constructor arg to 64bit
Evan Charlton [Fri, 31 Jan 2014 21:58:46 +0000 (13:58 -0800)]
resolved conflicts for merge of
cb7cdd50 to master-nova
Change-Id: Idf4f4b41ddfd15a0e6e45cf3a45f57fa39e82708
Alan Viverette [Fri, 31 Jan 2014 19:22:24 +0000 (19:22 +0000)]
Merge "Improve encapsulation of Resources"
Chris Wren [Fri, 31 Jan 2014 19:19:23 +0000 (19:19 +0000)]
Merge "record the notification style"
Alan Viverette [Fri, 31 Jan 2014 19:07:29 +0000 (11:07 -0800)]
Improve encapsulation of Resources
Change-Id: Ic408915d2695ac8906231da1d2dc127f94bdd0cc
Chris Craik [Fri, 31 Jan 2014 18:57:24 +0000 (18:57 +0000)]
Merge "Simplify umbra calculation"
Chris Craik [Fri, 31 Jan 2014 18:56:40 +0000 (18:56 +0000)]
Merge "Add initial hidden outline APIs"
Chris Craik [Thu, 30 Jan 2014 23:43:56 +0000 (15:43 -0800)]
Simplify umbra calculation
Reuse pre-computed values
Change-Id: Ia7725be0ec3ac58af477fcb8de375f5faa05abf4
Chris Wren [Wed, 5 Jun 2013 19:05:57 +0000 (15:05 -0400)]
record the notification style
Bug:
10634902
Change-Id: I7d29f252367f4ab58e97a6ac8b0c6702f558e5cf
Narayan Kamath [Fri, 31 Jan 2014 17:12:42 +0000 (17:12 +0000)]
am
797b5adc: am
77a1986c: am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
797b5adcb4ead3c687db3d9fd831dff93760dd4a':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Fri, 31 Jan 2014 17:12:38 +0000 (17:12 +0000)]
am
d49babe5: (-s ours) am
9af95574: am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
d49babe50d61e0264a9f4fbf0b4e182cc56635db':
Change ResourceType cookies to int32_t.
Nick Kralevich [Fri, 31 Jan 2014 16:46:03 +0000 (08:46 -0800)]
am
3dfa15c4: am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
3dfa15c49b4c78cdf3bf1af79e9b307596455708':
Map SELinux log levels to Android log levels.
Narayan Kamath [Fri, 31 Jan 2014 16:41:42 +0000 (16:41 +0000)]
am
ff62e966: am
149510e0: am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
ff62e966b60bb20dc7c3384485816b1e7bf06057':
Fixed cancel() not working correctly
Igor Murashkin [Fri, 31 Jan 2014 16:41:38 +0000 (16:41 +0000)]
am
ed5d7a6f: am
4463a4ef: am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
ed5d7a6f147c75c8af73328bdf816707b58afd90':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Narayan Kamath [Fri, 31 Jan 2014 16:29:23 +0000 (16:29 +0000)]
am
77a1986c: am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Fri, 31 Jan 2014 16:29:19 +0000 (16:29 +0000)]
am
9af95574: am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
Change ResourceType cookies to int32_t.
Narayan Kamath [Fri, 31 Jan 2014 16:29:16 +0000 (16:29 +0000)]
am
149510e0: am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
149510e010b46a445355a8d7fcdb8401125b92c3':
Fixed cancel() not working correctly
Igor Murashkin [Fri, 31 Jan 2014 16:29:06 +0000 (16:29 +0000)]
am
4463a4ef: am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
4463a4ef26b2eb62fae74568193fd07e97dedd4d':
EGL14.eglCreateWindowSurface should set producerControlledByApp
George Mount [Fri, 31 Jan 2014 00:56:09 +0000 (00:56 +0000)]
Revert "Add Path trimming."
Bug
12489442
This reverts commit
7fe03a267e6edb65142444765ce29ad5ff126052.
Change-Id: Idf434d79683e170364838388c7933a8591f7f4d3
Narayan Kamath [Fri, 31 Jan 2014 15:30:21 +0000 (07:30 -0800)]
am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
49b7ba4dbc0b4984fc466bb98e9cfa40650db85b':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Fri, 31 Jan 2014 15:30:18 +0000 (07:30 -0800)]
am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
1cadc07dd1e3711fb1e57548038e3026682c5ef8':
Change ResourceType cookies to int32_t.
Narayan Kamath [Fri, 31 Jan 2014 15:30:15 +0000 (07:30 -0800)]
am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
b9f960e094d53440be5c7e8759a74dbb0ab57317':
Fixed cancel() not working correctly
Igor Murashkin [Fri, 31 Jan 2014 15:30:12 +0000 (07:30 -0800)]
am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
e05b7b50e234e8ed2471f5ad96bb3d715067e9f3':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Zhijun He [Fri, 31 Jan 2014 15:12:38 +0000 (15:12 +0000)]
am
4f840dd1: am
5901ddeb: am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
4f840dd16db41a2d4442667193d57260f84af04a':
Release locked buffer when it fails to acquire graphics buffer
Narayan Kamath [Fri, 31 Jan 2014 15:12:34 +0000 (15:12 +0000)]
am
dfd1aa43: resolved conflicts for merge of
2cd0563c to klp-modular-dev-plus-aosp
* commit '
dfd1aa4331b8ab452d7baf4fdf8cf0cd36c67ddd':
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Narayan Kamath [Fri, 31 Jan 2014 15:12:30 +0000 (15:12 +0000)]
am
5cdbac1e: (-s ours) am
70986e19: am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72':
AArch64: Use of long for pointers in PropertyValuesHolder
Narayan Kamath [Fri, 31 Jan 2014 15:06:21 +0000 (15:06 +0000)]
am
133c9649: am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
133c9649c3c83e6ccefa4f46c162ddb3f55269d0':
change Surface constructor arg to 64bit
Narayan Kamath [Fri, 31 Jan 2014 15:06:17 +0000 (15:06 +0000)]
am
98ac6c79: resolved conflicts for merge of
cb7cdd50 to klp-modular-dev-plus-aosp
* commit '
98ac6c79a430e62a886b3a8278694425b5906300':
Fix a few more delegate methods in layoutlib.
Nick Kralevich [Fri, 31 Jan 2014 15:06:11 +0000 (15:06 +0000)]
am
643be3ba: am
3dfa15c4: am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
643be3bab19a6305e776721854b293928bf2bfaa':
Map SELinux log levels to Android log levels.
Narayan Kamath [Fri, 31 Jan 2014 14:35:13 +0000 (14:35 +0000)]
Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
Ashok Bhat [Fri, 17 Jan 2014 16:02:38 +0000 (16:02 +0000)]
AArch64: Make AssetManager and related classes 64-bit compatible
Following changes have been done:
[x] Long is used to store native pointers as pointers can be
64-bit.
[x] AssetManager openAsset native function returned -1 if
file name was empty and java function considered any
non-zero value as success. This has been fixed by native
function throwing Illegal Argument Exception as well.
[x] AssetManager incRefsLocked and decRefsLocked now accept
long as input to support 64-bit native references.
[x] AssetManager incRefsLocked method incorrecly used
'this.hashCode()' instead of the passed parameter id.
This has been fixed.
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
Change-Id: I095b9f900d49e51f43ad6afc47cbc23116a6a64a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Fri, 31 Jan 2014 14:13:47 +0000 (14:13 +0000)]
Merge "Change ResourceType cookies to int32_t."
Narayan Kamath [Mon, 27 Jan 2014 17:32:37 +0000 (17:32 +0000)]
Change ResourceType cookies to int32_t.
Also change the order of parameters in ResTable constructors
to avoid ambiguity.
(cherry picked from commit
00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1)
Change-Id: I874c5d03c134dc3c331fba423b5280366296287c
Narayan Kamath [Fri, 31 Jan 2014 13:46:08 +0000 (13:46 +0000)]
Merge "Change ResourceType cookies to int32_t."
Narayan Kamath [Fri, 31 Jan 2014 13:20:58 +0000 (13:20 +0000)]
Merge "Fixed cancel() not working correctly"
Zhijun He [Fri, 31 Jan 2014 13:00:35 +0000 (13:00 +0000)]
am
5901ddeb: am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
5901ddeb525ed7691c382e8d17f47055d7d1e5db':
Release locked buffer when it fails to acquire graphics buffer
Narayan Kamath [Fri, 31 Jan 2014 12:57:24 +0000 (12:57 +0000)]
resolved conflicts for merge of
2cd0563c to klp-modular-dev-plus-aosp
Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2
Narayan Kamath [Fri, 31 Jan 2014 12:17:09 +0000 (12:17 +0000)]
am
70986e19: am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
70986e197bbaf4de4f8126519a75df2b057c3b52':
AArch64: Use of long for pointers in PropertyValuesHolder
Narayan Kamath [Fri, 31 Jan 2014 12:17:05 +0000 (12:17 +0000)]
am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
fa2e16e36d95d5cf0848a28a98ac4566321fc119':
change Surface constructor arg to 64bit
Narayan Kamath [Fri, 31 Jan 2014 12:08:17 +0000 (12:08 +0000)]
resolved conflicts for merge of
cb7cdd50 to klp-modular-dev-plus-aosp
Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b
Nick Kralevich [Fri, 31 Jan 2014 10:26:32 +0000 (10:26 +0000)]
am
3dfa15c4: am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
3dfa15c49b4c78cdf3bf1af79e9b307596455708':
Map SELinux log levels to Android log levels.
Scott Main [Fri, 31 Jan 2014 08:18:05 +0000 (00:18 -0800)]
am
ca821336: am
53959634: am
40a7e3c4: am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
ca821336bdec3f1931f399e2a38e4171f92069a3':
Scott Main [Fri, 31 Jan 2014 08:18:02 +0000 (00:18 -0800)]
am
8d1a52c8: am
a749593d: am
04022e50: am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
8d1a52c832c392ad28d7a5400e436cdf6223d8f7':
Quddus Chong [Fri, 31 Jan 2014 08:17:57 +0000 (00:17 -0800)]
am
5e5d04b4: am
7ce575a5: am
bcf8faa6: am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
5e5d04b468719490ae3ef68573b9c204e0f2d6e5':
Hui Lu [Fri, 31 Jan 2014 08:17:53 +0000 (00:17 -0800)]
am
945d69d7: am
3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev
* commit '
945d69d7b843ed319ec98986b033ea7b86383e69':
Add proxy as another network.
Scott Main [Fri, 31 Jan 2014 08:12:30 +0000 (08:12 +0000)]
am
53959634: am
40a7e3c4: am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
53959634b35ab75ef40ac4514d50bae2de9425ac':
Revert "add Cast to the sidenav"
Scott Main [Fri, 31 Jan 2014 08:12:25 +0000 (08:12 +0000)]
am
a749593d: am
04022e50: am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
a749593dd64f6d8f8d5d5e6addd16699258e9130':
Revert "add google cast feature page"
Quddus Chong [Fri, 31 Jan 2014 08:12:20 +0000 (08:12 +0000)]
am
7ce575a5: am
bcf8faa6: am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
7ce575a5257328ce089d6eaa39eb493eafbd473c':
Revert "docs: Added API reference docs for GCore Iberico release."
Hui Lu [Fri, 31 Jan 2014 08:11:57 +0000 (08:11 +0000)]
am
3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev
* commit '
3cab7fc1b8f06166df3a58cf10d4a0db36bde788':
Add proxy as another network.
George Mount [Fri, 31 Jan 2014 04:37:49 +0000 (20:37 -0800)]
am
d0856259: Merge "Add PathInterpolator to interpolate along a Path."
* commit '
d0856259762eddd873a068c2e9cd3d4e45009a68':
Add PathInterpolator to interpolate along a Path.
Scott Main [Fri, 31 Jan 2014 02:53:23 +0000 (18:53 -0800)]
am
40a7e3c4: am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
40a7e3c425120661c305999f7c2bdd76d3240b7d':
Revert "add Cast to the sidenav"
Scott Main [Fri, 31 Jan 2014 02:53:20 +0000 (18:53 -0800)]
am
04022e50: am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
04022e50774c02ff0a7757c5464486af021fd108':
Revert "add google cast feature page"
Quddus Chong [Fri, 31 Jan 2014 02:53:11 +0000 (18:53 -0800)]
am
bcf8faa6: am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
bcf8faa6c79bde5b9580057238e447165ac9d329':
Revert "docs: Added API reference docs for GCore Iberico release."
Igor Murashkin [Fri, 31 Jan 2014 01:26:14 +0000 (01:26 +0000)]
Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
George Mount [Fri, 31 Jan 2014 00:53:19 +0000 (00:53 +0000)]
Merge "Add PathInterpolator to interpolate along a Path."
George Mount [Thu, 10 Oct 2013 22:28:17 +0000 (15:28 -0700)]
Add PathInterpolator to interpolate along a Path.
Change-Id: I45b361ef8edd49b5e22d66ba9e25600065e0d5e7
Brian Carlstrom [Fri, 31 Jan 2014 00:23:32 +0000 (16:23 -0800)]
am
a76be8ba: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
a76be8ba7ac14092669c981e76f07f97d2c3f386':
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Fri, 31 Jan 2014 00:21:15 +0000 (00:21 +0000)]
Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
Chris Craik [Wed, 29 Jan 2014 01:25:06 +0000 (17:25 -0800)]
Add initial hidden outline APIs
Background drawable outline usage and drawable outline calculation
still to come.
Change-Id: I8c7539f1638f86e1f8eb11f4fe49f705f61d58ba
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
(cherry picked from commit
c6c633608ad4cd77ed21227b0bdb11eb79797c31)
Bug:
12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
John Reck [Thu, 30 Jan 2014 23:31:47 +0000 (15:31 -0800)]
am
3040f735: Merge "Fix nano vs. millis"
* commit '
3040f7354106dbc2a43b0ca21de25811f0d4057d':
Fix nano vs. millis
Scott Main [Thu, 30 Jan 2014 23:25:08 +0000 (23:25 +0000)]
am
40a7e3c4: am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
40a7e3c425120661c305999f7c2bdd76d3240b7d':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 23:25:02 +0000 (23:25 +0000)]
am
04022e50: am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
04022e50774c02ff0a7757c5464486af021fd108':
Revert "add google cast feature page"
Quddus Chong [Thu, 30 Jan 2014 23:24:54 +0000 (23:24 +0000)]
am
bcf8faa6: am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
bcf8faa6c79bde5b9580057238e447165ac9d329':
Revert "docs: Added API reference docs for GCore Iberico release."
John Reck [Thu, 30 Jan 2014 23:16:09 +0000 (23:16 +0000)]
Merge "Fix nano vs. millis"
Zhijun He [Thu, 30 Jan 2014 23:03:30 +0000 (15:03 -0800)]
am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
0a1b64fe79f41eec5cebe8434ab30d93e2ea2724':
Release locked buffer when it fails to acquire graphics buffer
Zhijun He [Thu, 30 Jan 2014 23:01:20 +0000 (23:01 +0000)]
Merge "Release locked buffer when it fails to acquire graphics buffer"
Hui Lu [Thu, 30 Jan 2014 22:58:48 +0000 (22:58 +0000)]
Merge "Add proxy as another network." into klp-modular-dev
Hui Lu [Wed, 15 Jan 2014 16:05:36 +0000 (11:05 -0500)]
Add proxy as another network.
Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
Fabrice Di Meglio [Thu, 30 Jan 2014 22:18:40 +0000 (14:18 -0800)]
am
d95dc28f: Merge "Make public but hide OnPreferenceTreeClickListener"
* commit '
d95dc28f8ecddc0201144a2aa3f1ebbc018e5892':
Make public but hide OnPreferenceTreeClickListener
Fabrice Di Meglio [Thu, 30 Jan 2014 22:18:36 +0000 (14:18 -0800)]
am
25da1bac: Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216)"
* commit '
25da1bac824033be3807d79eb22e83a32a57cfd8':
Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216)
Fabrice Di Meglio [Thu, 30 Jan 2014 22:17:16 +0000 (22:17 +0000)]
Merge "Make public but hide OnPreferenceTreeClickListener"
Fabrice Di Meglio [Thu, 30 Jan 2014 22:15:07 +0000 (22:15 +0000)]
Merge "Fix bug #
12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216)"
Brian Carlstrom [Thu, 30 Jan 2014 22:11:02 +0000 (14:11 -0800)]
am
3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
3038046b23540ccf4ca80f181386a77cf64d5e27':
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Scott Main [Thu, 30 Jan 2014 22:10:50 +0000 (22:10 +0000)]
am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
e71cc6fd82df1bf654d72e796ac7975dbf0aff29':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 22:10:45 +0000 (22:10 +0000)]
am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
4b1a317abb56dc90efacf86ccd796643b1f02478':
Revert "add google cast feature page"
Patrick Tjin [Thu, 30 Jan 2014 21:52:28 +0000 (13:52 -0800)]
am
ca7d380f: Merge "Formatting fix"
* commit '
ca7d380fb82bfbcb66782b0c7b6150db35e133f2':
Formatting fix
Andy McFadden [Thu, 30 Jan 2014 21:52:25 +0000 (13:52 -0800)]
am
acdbb9a9: Merge "Allow "opaque" flag to be updated"
* commit '
acdbb9a9e1443b6690864446d76e4067f2bd7640':
Allow "opaque" flag to be updated
Scott Main [Thu, 30 Jan 2014 21:52:15 +0000 (21:52 +0000)]
am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
897739f1b7d179cd402fcf907e2ac9751fe44c6d':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 21:52:11 +0000 (21:52 +0000)]
am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
428ccea5090d3a88d6af898cd90b52df4062101f':
Revert "add google cast feature page"
Brian Carlstrom [Thu, 30 Jan 2014 21:50:57 +0000 (21:50 +0000)]
Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
OSDN Git Service
