Alex Klyubin
afa10ad39a
am 2110a28a: am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."
...
* commit '2110a28a6c7ef7d7802028d0a2dd9c14ceb432e1':
Add android.security.NetworkSecurityPolicy.
2015-03-22 00:40:51 +00:00
Griff Hazen
583c7c569b
am 38f75097: am 0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
...
* commit '38f75097ff0bc265dbfba9c40cda6c017078b82e':
Allow emulator to select a window outset bottom
2015-03-22 00:11:11 +00:00
Griff Hazen
38f75097ff
am 0b42ff79: Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
...
* commit '0b42ff7916e6cc32c812a3be8f3e4ebdf96e8553':
Allow emulator to select a window outset bottom
2015-03-22 00:05:48 +00:00
Griff Hazen
0b42ff7916
Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
2015-03-21 23:59:46 +00:00
Alan Viverette
12062c6e99
am 19537c0a: am 38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip"
...
* commit '19537c0a18998622c8555573a7df0b32853fbde3':
Move arrow_pointer hotspot to better match actual tip
2015-03-21 20:26:16 +00:00
Alan Viverette
19537c0a18
am 38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip"
...
* commit '38fcaf4037a50225b931551a48c898c7b0bb4db2':
Move arrow_pointer hotspot to better match actual tip
2015-03-21 20:20:48 +00:00
Alan Viverette
38fcaf4037
Merge "Move arrow_pointer hotspot to better match actual tip"
2015-03-21 20:06:57 +00:00
Chad Brubaker
6050eb5459
am 5b11b3d6: am 31cee318: Merge "Specify public exponent for RSA"
...
* commit '5b11b3d6c50c9fc705ae73a2ffcc4b9b57f96c78':
Specify public exponent for RSA
2015-03-21 19:37:46 +00:00
Chad Brubaker
5b11b3d6c5
am 31cee318: Merge "Specify public exponent for RSA"
...
* commit '31cee318f0494e6d77fc55599f285f534435405e':
Specify public exponent for RSA
2015-03-21 19:31:22 +00:00
Chad Brubaker
31cee318f0
Merge "Specify public exponent for RSA"
2015-03-21 19:18:25 +00:00
Dmitriy Ivanov
ff193d642e
Load libraries directly from apk
...
Introduced new 'extractNativeLibs' attribute to manifest/application.
Setting it to false prevents installer from extracting library from apk.
The default value for extractNativeLibs is true.
Bug: 8076853
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-03-21 11:46:11 -07:00
Geoff Mendal
7163a0a1a6
am 57d7b5f4: (-s ours) am 1f9bad3c: (-s ours) Import translations. DO NOT MERGE
...
* commit '57d7b5f4eab81c0f9a61d5069b74ca034982a5f5':
Import translations. DO NOT MERGE
2015-03-21 16:21:31 +00:00
Geoff Mendal
57d7b5f4ea
am 1f9bad3c: (-s ours) Import translations. DO NOT MERGE
...
* commit '1f9bad3cb98964aaaecc2266102348b85d6fae9a':
Import translations. DO NOT MERGE
2015-03-21 15:34:55 +00:00
Geoff Mendal
bb132be258
Merge "Import translations. DO NOT MERGE"
2015-03-21 10:47:39 +00:00
Geoff Mendal
cef2859177
Import translations. DO NOT MERGE
...
Change-Id: Id89aa9b780767034dc2b0b81d2cb0a49288ce882
Auto-generated-cl: translation import
2015-03-21 01:36:45 -07:00
Geoff Mendal
c2eef6c5aa
Merge "Import translations. DO NOT MERGE"
2015-03-21 07:02:46 +00:00
Geoff Mendal
273c6f2e00
Import translations. DO NOT MERGE
...
Change-Id: I0acc044f88445fe6d48f84bcaee6a971409ad144
Auto-generated-cl: translation import
2015-03-21 02:02:20 -05:00
Geoff Mendal
ed4267d0d6
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:57:46 +00:00
Geoff Mendal
3997c05782
Import translations. DO NOT MERGE
...
Change-Id: Ia2267065864b0a7ff750e2956f0bab7507b8c32c
Auto-generated-cl: translation import
2015-03-20 23:56:54 -07:00
Geoff Mendal
ff88dba81c
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:54:25 +00:00
Geoff Mendal
672aab38b6
Import translations. DO NOT MERGE
...
Change-Id: I3b918278be7f5c4849a49821ab35385abaf440e4
Auto-generated-cl: translation import
2015-03-20 23:53:59 -07:00
Geoff Mendal
f2ab5f6e55
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:43:42 +00:00
Geoff Mendal
ed963393c3
Import translations. DO NOT MERGE
...
Change-Id: I05e39854eb2d78c22192faebdbfab579831b162a
Auto-generated-cl: translation import
2015-03-20 23:42:27 -07:00
Geoff Mendal
2b37ae6e3c
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:40:03 +00:00
Geoff Mendal
d397039876
Import translations. DO NOT MERGE
...
Change-Id: I43f19279f08e1c5b204836ee69e715c1f889acc7
Auto-generated-cl: translation import
2015-03-20 23:39:30 -07:00
Geoff Mendal
23d3a54673
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:37:07 +00:00
Geoff Mendal
6536f65afb
Import translations. DO NOT MERGE
...
Change-Id: Ifac523c71970a048540fcfdbdb81b1b6d02e630a
Auto-generated-cl: translation import
2015-03-20 23:36:23 -07:00
Geoff Mendal
b72ae7a8f3
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:30:13 +00:00
Geoff Mendal
c549f8f4a9
Import translations. DO NOT MERGE
...
Change-Id: I4f9a97623c88e65d32873d996f29725024d9f37e
Auto-generated-cl: translation import
2015-03-20 23:28:43 -07:00
Geoff Mendal
3f7aee5808
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:26:41 +00:00
Geoff Mendal
c6d8b937d0
Import translations. DO NOT MERGE
...
Change-Id: I274a842ea3e3811e64c35791e2eb3a7603509184
Auto-generated-cl: translation import
2015-03-20 23:25:50 -07:00
Geoff Mendal
d4f45766fa
Import translations. DO NOT MERGE
...
Change-Id: I6ead0981923edc795695e1419ae5dfff28c5fb5c
Auto-generated-cl: translation import
2015-03-20 23:24:42 -07:00
Geoff Mendal
427de1b691
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:23:56 +00:00
Geoff Mendal
b91a3309b6
Import translations. DO NOT MERGE
...
Change-Id: I5d8cc25c94f71a9f3f14307fbb2f09e0779f4d6e
Auto-generated-cl: translation import
2015-03-20 23:23:01 -07:00
Geoff Mendal
ddb47ba186
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:20:27 +00:00
Geoff Mendal
c98146b556
Import translations. DO NOT MERGE
...
Change-Id: Iac1b987545c21b2e4b29787b13fbaf3414a6a2fb
Auto-generated-cl: translation import
2015-03-20 23:20:04 -07:00
Geoff Mendal
24284b578d
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:17:48 +00:00
Geoff Mendal
0ae2b12c29
Import translations. DO NOT MERGE
...
Change-Id: I1bdbaf86f8f5fd957938b9d186e824d115054e10
Auto-generated-cl: translation import
2015-03-20 23:17:07 -07:00
Geoff Mendal
1f9bad3cb9
Import translations. DO NOT MERGE
...
Change-Id: I59ad105e99dbd4c8bd19c4e94eecd6e19425345a
Auto-generated-cl: translation import
2015-03-20 23:15:45 -07:00
Geoff Mendal
1e0cde0ada
Merge "Import translations. DO NOT MERGE"
2015-03-21 06:15:15 +00:00
Ruben Brunk
7559a98ef1
Merge "camera2: Remove ProCamera."
2015-03-21 06:14:19 +00:00
Geoff Mendal
9bf5801545
Import translations. DO NOT MERGE
...
Change-Id: I6fd85e17705e81326d3440fc3ef2180683c968b3
Auto-generated-cl: translation import
2015-03-20 23:14:05 -07:00
Geoff Mendal
43c0e5bf3c
Import translations. DO NOT MERGE
...
Change-Id: Ia6706068d602792edfbbca15f3832b0447b9b13e
Auto-generated-cl: translation import
2015-03-20 23:11:02 -07:00
Ruben Brunk
2c2546a296
camera2: Remove ProCamera.
...
Bug: 19186859
Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
2015-03-20 22:38:54 -07:00
Zhijun He
960a285a7e
Merge "ImageReader/Writer: Add ImageWriter and Opaque ImageReader"
2015-03-21 01:25:03 +00:00
Zhijun He
f6a09e5106
ImageReader/Writer: Add ImageWriter and Opaque ImageReader
...
ImageWriter/Reader API change, including below changes
* Interface for Opaque ImageReader
* ImageWriter Interface and implementation
* Image class minor update to support ImageWriter opaque ImageReader
detach/attach interface are defined but yet to be implemented.
Change-Id: Ic7c0d2df73c80b1a81a7316d8c4556bf7703c309
2015-03-20 18:19:58 -07:00
Tim Kilbourn
66d2bbf1e1
Fix jni method signature.
...
Bug: 19870217
Change-Id: I8db1bb8cb8af2df73e899b861c91f090c068d127
2015-03-20 16:56:13 -07:00
Alan Viverette
6194d728cf
Correctly apply android:theme attribute from <include> tag
...
Bug: 19865544
Change-Id: I6b50fa9f28a9d7f1685f9f55e505c630c12c53a2
2015-03-20 15:49:06 -07:00
Jeff Brown
13d81b6dd2
am 619ce1ce: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
...
* commit '619ce1ce534775ab0ff4d591a69dafd53c04a315':
Disable more hotkeys while in setup.
2015-03-20 22:35:41 +00:00
Jason Sams
0590423d71
Merge "unhide AllocationAdapter APIs"
2015-03-20 22:14:26 +00:00