OSDN Git Service
Narayan Kamath [Thu, 1 May 2014 10:18:11 +0000 (10:18 +0000)]
am
fbb0ab02: Merge "Fix broken logging in Zygote.cpp."
* commit '
fbb0ab02bed5c49159acb3dba6848a154e524169':
Fix broken logging in Zygote.cpp.
Narayan Kamath [Thu, 1 May 2014 10:15:00 +0000 (10:15 +0000)]
Merge "Fix broken logging in Zygote.cpp."
Narayan Kamath [Mon, 14 Apr 2014 13:46:07 +0000 (14:46 +0100)]
Fix broken logging in Zygote.cpp.
- Differentiate between clean exits and signals.
- Change the logic for the waitpid warning. We should log it
only if the *first* call to waitpid returned ECHILD.
Change-Id: I6bc50e4ffd100fb7f3f526d6b4056bed10b8045f
Elliott Hughes [Wed, 30 Apr 2014 21:33:06 +0000 (21:33 +0000)]
am
86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
* commit '
86315c452b955bf0b874f45c1a2e15aedda91a52':
Fixes issue causing pseudolocalization of strings in non-translatable resource files.
Elliott Hughes [Wed, 30 Apr 2014 21:29:52 +0000 (21:29 +0000)]
Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."
Michael Wright [Wed, 30 Apr 2014 19:06:40 +0000 (19:06 +0000)]
am
54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '
54c3529b4d3f86488799caa0e62a1f3929a79a39':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Michael Wright [Wed, 30 Apr 2014 19:02:56 +0000 (19:02 +0000)]
Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
Elliott Hughes [Wed, 30 Apr 2014 19:02:53 +0000 (19:02 +0000)]
am
7d3f9e97: Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
* commit '
7d3f9e9730b100de4c0e643e13bf59bf54ef7819':
Fix for native leaks in YuvToJpegEncoder.cpp
Elliott Hughes [Wed, 30 Apr 2014 18:59:54 +0000 (18:59 +0000)]
Merge "Fix for native leaks in YuvToJpegEncoder.cpp"
Igor Viarheichyk [Wed, 30 Apr 2014 18:56:42 +0000 (11:56 -0700)]
Fixes issue causing pseudolocalization of strings
in non-translatable resource files.
Change-Id: Ic8e5effc86226d5be00561ac71bab7695ef90376
Narayan Kamath [Wed, 30 Apr 2014 15:13:02 +0000 (15:13 +0000)]
am
56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '
56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07':
Cast CallVoidMethod's size_t parameters to jint
Narayan Kamath [Wed, 30 Apr 2014 15:12:58 +0000 (15:12 +0000)]
am
d0f7f418: Merge "Freeing frame map"
* commit '
d0f7f41828493b0679e908f7bb3ed3b8e838c463':
Freeing frame map
Narayan Kamath [Wed, 30 Apr 2014 13:34:04 +0000 (13:34 +0000)]
Merge "Cast CallVoidMethod's size_t parameters to jint"
Narayan Kamath [Wed, 30 Apr 2014 10:58:30 +0000 (10:58 +0000)]
Merge "Freeing frame map"
Mykola Kondratenko [Tue, 15 Apr 2014 07:35:44 +0000 (09:35 +0200)]
Freeing frame map
FileMap memory is never released until application exit
Release it now as the texture is already loaded and the memory
used for the packed resource can be released.
Change-Id: Id08a1e466337b3a0179684eb6a444e18147ee343
Allen Shen [Tue, 29 Apr 2014 08:16:29 +0000 (16:16 +0800)]
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Originally the api 'getCropAndSetWallpaperIntent' does not check
whether the parsed parameter is a NULL pointer, as leads to the
whole app crash if it call this api with a null parameter accidentally.
A null pointer check logic is added into its original parameter check
logic, so that this API will throw an IllegalArgumentException if it
is parsed with a null pointer
Change-Id: Ib7de40e571419d09e1a744edc969eb7162766b75
Bill Yi [Wed, 30 Apr 2014 01:52:48 +0000 (18:52 -0700)]
Fix build error
Change-Id: I6f52954a780b747f1ad2a4e429ef192d58c40e76
Michael Wright [Wed, 30 Apr 2014 01:22:05 +0000 (01:22 +0000)]
am
ade631ee: Merge "NULL previous background bitmap upon changing wallpaper"
* commit '
ade631eed0df228e343f2a00db653058ff588846':
NULL previous background bitmap upon changing wallpaper
Michael Wright [Wed, 30 Apr 2014 01:19:10 +0000 (01:19 +0000)]
Merge "NULL previous background bitmap upon changing wallpaper"
Michael Wright [Wed, 30 Apr 2014 00:07:11 +0000 (00:07 +0000)]
am
357c75e7: Merge "Add missing character combinations for international layouts"
* commit '
357c75e74760933f05ff89352ee86dd540633782':
Add missing character combinations for international layouts
Michael Wright [Wed, 30 Apr 2014 00:03:29 +0000 (00:03 +0000)]
am
8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
* commit '
8a02b20f6f3fdd5baa5d22321769303ce76ba80a':
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
Michael Wright [Wed, 30 Apr 2014 00:01:38 +0000 (00:01 +0000)]
Merge "Add missing character combinations for international layouts"
Michael Wright [Tue, 29 Apr 2014 23:58:16 +0000 (23:58 +0000)]
Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
Bill Yi [Tue, 29 Apr 2014 23:07:29 +0000 (16:07 -0700)]
Nick Kralevich [Tue, 29 Apr 2014 22:24:32 +0000 (22:24 +0000)]
am
af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
* commit '
af40649e4ad506e312b53518cd2b9f2b58dee3ba':
Set NO_NEW_PRIVS on zygote init
Nick Kralevich [Tue, 29 Apr 2014 22:20:47 +0000 (22:20 +0000)]
Merge "Set NO_NEW_PRIVS on zygote init"
Nick Kralevich [Fri, 25 Apr 2014 22:01:24 +0000 (15:01 -0700)]
Set NO_NEW_PRIVS on zygote init
When app_process/zygote starts, make sure PR_SET_NO_NEW_PRIVS is set.
This prevents zygote spawned apps from acquiring new privileges
on exec.
In particular, this allows the CTS test
android.os.cts.SecurityFeaturesTest#testNoNewPrivs() to pass if ART is set
as the default runtime.
Change-Id: I81139cda999c7b1430242561aad28f566e9b6da0
Selim Gurun [Tue, 29 Apr 2014 18:45:53 +0000 (18:45 +0000)]
am
5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub"
* commit '
5c220cc4e4c0584a9083529b58e30e17ab7d2d9e':
DO NOT MERGE Add invokeFunctor stub
Selim Gurun [Tue, 29 Apr 2014 18:42:25 +0000 (18:42 +0000)]
Merge "DO NOT MERGE Add invokeFunctor stub"
Bo Liu [Tue, 29 Apr 2014 18:38:37 +0000 (11:38 -0700)]
DO NOT MERGE Add invokeFunctor stub
Change-Id: Ib7637d68c4f63065b909075a8f5d8cd1dd0674bd
Mathieu Meisser [Tue, 17 Dec 2013 17:07:40 +0000 (18:07 +0100)]
Add missing character combinations for international layouts
Czech: add missing capslock for numbers and shift+ralt
mappings.
Slovak: fix wrong ralt mappings, add missing ralt mappings
and fixed wrong PLUS key character.
US intl: add missing capslock+ralt support.
Swiss French and Swiss German: add missing ralt mapping for key
numbers 4 and 5, and add missing capslock and capslock+
shift for SEMICOLON and APOSTROPHE.
Change-Id: I02c94bf13d5268d5d1e648c96b7251cb7564f233
Signed-off-by: Olivier Gay <ogay@logitech.com>
Signed-off-by: Manuel Carthoblaz <mcarthob@logitech.com>
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
Elliott Hughes [Tue, 29 Apr 2014 04:01:01 +0000 (04:01 +0000)]
am
10d57c4b: Merge "Fix two zygote imports."
* commit '
10d57c4bc7459d0c73b254af006a3528e9a0c33e':
Fix two zygote imports.
Elliott Hughes [Tue, 29 Apr 2014 03:56:19 +0000 (03:56 +0000)]
am
2e9d924d: Merge "Remove unused import."
* commit '
2e9d924d4f4275c72df4be28d85482064cee43f8':
Remove unused import.
Elliott Hughes [Tue, 29 Apr 2014 03:54:49 +0000 (03:54 +0000)]
Merge "Fix two zygote imports."
Elliott Hughes [Tue, 29 Apr 2014 03:53:52 +0000 (20:53 -0700)]
Fix two zygote imports.
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
Elliott Hughes [Tue, 29 Apr 2014 03:52:10 +0000 (03:52 +0000)]
Merge "Remove unused import."
Elliott Hughes [Tue, 29 Apr 2014 03:51:34 +0000 (20:51 -0700)]
Remove unused import.
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
Elliott Hughes [Tue, 29 Apr 2014 02:31:34 +0000 (02:31 +0000)]
am
f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."
* commit '
f4a7ac00a734343b8d2760def352cbdf99fa08c7':
Move the Zygote off libcore.os and onto android.system.
Elliott Hughes [Tue, 29 Apr 2014 02:28:06 +0000 (02:28 +0000)]
Merge "Move the Zygote off libcore.os and onto android.system."
Elliott Hughes [Tue, 29 Apr 2014 02:19:13 +0000 (19:19 -0700)]
Move the Zygote off libcore.os and onto android.system.
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
Elliott Hughes [Mon, 28 Apr 2014 19:45:06 +0000 (19:45 +0000)]
Elliott Hughes [Mon, 28 Apr 2014 19:41:24 +0000 (19:41 +0000)]
Merge "Fix build."
Elliott Hughes [Mon, 28 Apr 2014 19:40:12 +0000 (12:40 -0700)]
Fix build.
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
Elliott Hughes [Mon, 28 Apr 2014 18:17:06 +0000 (18:17 +0000)]
am
bbd87eb9: Merge "Track libcore.os\' move to android.system."
* commit '
bbd87eb9193e9730869171324ee4f5fc1abeae55':
Track libcore.os' move to android.system.
Elliott Hughes [Mon, 28 Apr 2014 18:13:59 +0000 (18:13 +0000)]
Merge "Track libcore.os' move to android.system."
Mathieu Chartier [Mon, 28 Apr 2014 18:13:07 +0000 (18:13 +0000)]
am
0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."
* commit '
0cd623bb9f832194cdd9c08625fa32583e947c76':
Use Runtime.gc instead of System.gc for DDMS.
Elliott Hughes [Mon, 28 Apr 2014 18:11:32 +0000 (11:11 -0700)]
Track libcore.os' move to android.system.
(This is partial, but should cover everything in AOSP master except
for the zygote.)
Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
Mathieu Chartier [Mon, 28 Apr 2014 18:10:41 +0000 (18:10 +0000)]
Merge "Use Runtime.gc instead of System.gc for DDMS."
Mathieu Chartier [Mon, 28 Apr 2014 17:16:17 +0000 (10:16 -0700)]
Use Runtime.gc instead of System.gc for DDMS.
System.gc doesn't always do a GC unless to attempt to run the
finalizers after you call System.gc.
Bug:
14325353
Change-Id: Iebed7fad5576d610cea13a86e7d3d46652c67478
Wink Saville [Sat, 26 Apr 2014 00:20:02 +0000 (00:20 +0000)]
am
3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error"
* commit '
3f4867f49d6c1932117e3519ce10d11f37829f19':
Telephony: Add functionality to handle ICC IO error
Wink Saville [Fri, 25 Apr 2014 23:58:11 +0000 (23:58 +0000)]
Merge "Telephony: Add functionality to handle ICC IO error"
Mark Salyzyn [Fri, 25 Apr 2014 22:03:20 +0000 (22:03 +0000)]
am
ac732708: Merge "EventLog: event log translation errors"
* commit '
ac7327082c411617f7937b87575c117bd63ad9df':
EventLog: event log translation errors
Mark Salyzyn [Fri, 25 Apr 2014 21:59:18 +0000 (21:59 +0000)]
Merge "EventLog: event log translation errors"
Mark Salyzyn [Fri, 25 Apr 2014 20:25:18 +0000 (13:25 -0700)]
EventLog: event log translation errors
- Deal with L using v3 event log format, or K using v1 or v2 event log format
Change-Id: Id4fb205f51b7e506135888d565acf1604497b91f
Marco Nelissen [Fri, 25 Apr 2014 14:46:35 +0000 (14:46 +0000)]
am
adcf38c9: Merge "Release DrmManagerClient resources"
* commit '
adcf38c9936fa372309d413cec03a1413e797c7a':
Release DrmManagerClient resources
Marco Nelissen [Fri, 25 Apr 2014 14:42:02 +0000 (14:42 +0000)]
Merge "Release DrmManagerClient resources"
Selim Gurun [Fri, 25 Apr 2014 01:12:46 +0000 (01:12 +0000)]
am
8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '
8c2d70f5e8dfe64213f44c29562fe4240779b68b':
Add a stub for forgotten callback to fix master-gpl.
Selim Gurun [Fri, 25 Apr 2014 01:08:48 +0000 (01:08 +0000)]
Merge "Add a stub for forgotten callback to fix master-gpl."
Selim Gurun [Fri, 25 Apr 2014 01:04:04 +0000 (18:04 -0700)]
Add a stub for forgotten callback to fix master-gpl.
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
Selim Gurun [Fri, 25 Apr 2014 00:41:59 +0000 (00:41 +0000)]
am
adad989b: Merge "Add a stub to fix master-gpl"
* commit '
adad989b6a2c736f427526e747dcb89ed9762bab':
Add a stub to fix master-gpl
Selim Gurun [Fri, 25 Apr 2014 00:39:09 +0000 (00:39 +0000)]
Merge "Add a stub to fix master-gpl"
Selim Gurun [Fri, 25 Apr 2014 00:29:55 +0000 (17:29 -0700)]
Add a stub to fix master-gpl
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
Elliott Hughes [Thu, 24 Apr 2014 23:55:09 +0000 (23:55 +0000)]
am
31a1dd2a: Merge "Use the suggested public API instead of libcore.os."
* commit '
31a1dd2a8f56b439861ee335b55f44323318830c':
Use the suggested public API instead of libcore.os.
Elliott Hughes [Thu, 24 Apr 2014 23:52:16 +0000 (23:52 +0000)]
Merge "Use the suggested public API instead of libcore.os."
Elliott Hughes [Thu, 24 Apr 2014 00:58:57 +0000 (17:58 -0700)]
Use the suggested public API instead of libcore.os.
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
Mark Salyzyn [Thu, 24 Apr 2014 22:14:02 +0000 (22:14 +0000)]
am
c717179e: Merge "jni: android_util_Process 64 bit issues"
* commit '
c717179e4fec346334fe4bb8603184499b746179':
jni: android_util_Process 64 bit issues
Mark Salyzyn [Thu, 24 Apr 2014 22:10:22 +0000 (22:10 +0000)]
Merge "jni: android_util_Process 64 bit issues"
Mark Salyzyn [Thu, 24 Apr 2014 20:05:18 +0000 (13:05 -0700)]
jni: android_util_Process 64 bit issues
- critical issue with using %lld to scanf into a jlong
- subsidiary issues with mix jint, jsize and jlong printing
Change-Id: I77c6b3d3a202fec741cacc540fc39ad6cba25f52
Nick Kralevich [Thu, 24 Apr 2014 18:22:20 +0000 (18:22 +0000)]
am
84803849: Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
* commit '
8480384986c314bd97b841cbf7f63acb7055ecef':
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Nick Kralevich [Thu, 24 Apr 2014 18:18:01 +0000 (18:18 +0000)]
Merge "Zygote: enable CAP_BLOCK_SUSPEND capability for system server"
Daniel Leung [Fri, 20 Dec 2013 18:37:35 +0000 (10:37 -0800)]
Zygote: enable CAP_BLOCK_SUSPEND capability for system server
Starting from kernel 3.6, it requires processes to have the capability
CAP_BLOCK_SUSPEND to set/unset wake locks. Adds CAP_BLOCK_SUSPEND
to the list of capabilities for system server, so that PowerManager
can set wake locks.
Change-Id: I3246e6f6e6cb8f0bedb1c0417ed07085ee1f3aaa
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Elliott Hughes [Thu, 24 Apr 2014 00:25:01 +0000 (00:25 +0000)]
am
dbb0de21: Merge "Fix a typo in an assertion."
* commit '
dbb0de21d35343504b096ae6cbf97d122ac410c9':
Fix a typo in an assertion.
Elliott Hughes [Wed, 23 Apr 2014 23:55:33 +0000 (23:55 +0000)]
Merge "Fix a typo in an assertion."
Elliott Hughes [Wed, 23 Apr 2014 23:54:33 +0000 (16:54 -0700)]
Fix a typo in an assertion.
Change-Id: I3e97bb3cb8070c0ec0c6b97769f1da3e7b4ef8f5
Neil Fuller [Wed, 23 Apr 2014 16:45:15 +0000 (16:45 +0000)]
am
683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit '
683cf1bffe33f49f26d46201f96cd2eff60e8192':
Changes to support asynchronous close interruption
Neil Fuller [Wed, 23 Apr 2014 16:41:16 +0000 (16:41 +0000)]
Merge "Changes to support asynchronous close interruption"
Neil Fuller [Fri, 11 Apr 2014 16:29:54 +0000 (17:29 +0100)]
Changes to support asynchronous close interruption
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a
Bug:
13927110
Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
Deepanshu Gupta [Tue, 22 Apr 2014 23:10:40 +0000 (23:10 +0000)]
am
53b7df19: Merge "Add missing ICU_Delegate methods."
* commit '
53b7df19cf287ea48b2ce27ab9cd7ddbc3d04330':
Add missing ICU_Delegate methods.
Deepanshu Gupta [Tue, 22 Apr 2014 23:08:05 +0000 (23:08 +0000)]
Merge "Add missing ICU_Delegate methods."
Nick Kralevich [Tue, 22 Apr 2014 19:52:21 +0000 (19:52 +0000)]
am
d267c1a0: Merge "remove unneeded import statements."
* commit '
d267c1a06fc91dc300d5c5f8b7ef9bd44825c34e':
remove unneeded import statements.
Nick Kralevich [Tue, 22 Apr 2014 19:52:18 +0000 (19:52 +0000)]
am
a67d4a6e: Merge "remove unused import."
* commit '
a67d4a6e4da1eb02a15a1048a26329cfed312938':
remove unused import.
Nick Kralevich [Tue, 22 Apr 2014 19:24:47 +0000 (19:24 +0000)]
Merge "remove unneeded import statements."
Nick Kralevich [Tue, 22 Apr 2014 19:23:30 +0000 (19:23 +0000)]
Merge "remove unused import."
Nick Kralevich [Tue, 22 Apr 2014 19:17:51 +0000 (12:17 -0700)]
remove unneeded import statements.
Internal master is out of sync with AOSP. Resync.
Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e
Nick Kralevich [Tue, 22 Apr 2014 19:10:24 +0000 (12:10 -0700)]
remove unused import.
This change resynchronizes AOSP with internal master.
The import line is unused.
Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e
Zach Swasey [Fri, 18 Apr 2014 00:49:35 +0000 (17:49 -0700)]
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
This fixes a bug where a View with filterTouchesWhenObscured will have
all touches filtered when in magnification accessibility mode. This is
due to magnification being a separate Window over top of the running
Activity. The method onFilterTouchEventForSecurity in View will then
always return false when filterTouchesWhenObscured is enabled on the
View. By adding the magnification Window to the list of Trusted Overlays
we can ensure that touches will work properly with this property enabled.
Change-Id: I07706588a625682d05da5cb19f401139eb08a54c
Deepanshu Gupta [Mon, 21 Apr 2014 21:33:33 +0000 (14:33 -0700)]
Add missing ICU_Delegate methods.
Update the ICU_Delegate to add methods originally added in
I5de58be7e8a701f2c40182ea54bceff85ec1aad2
Change-Id: I536834fe76cbc7dae05580182fee1bea956e3e77
Jesse Hall [Mon, 21 Apr 2014 19:41:29 +0000 (19:41 +0000)]
am
fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."
* commit '
fc3c6a0ef36cc4969aa7d8e160cc55f30c653325':
EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
Jesse Hall [Mon, 21 Apr 2014 19:38:45 +0000 (19:38 +0000)]
Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."
Ying Wang [Mon, 21 Apr 2014 13:35:26 +0000 (13:35 +0000)]
am
2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
* commit '
2a52862db5257edcafa137276ce3d8dc54cd443e':
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
Ying Wang [Sat, 19 Apr 2014 00:07:49 +0000 (00:07 +0000)]
Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
Ying Wang [Fri, 18 Apr 2014 01:14:50 +0000 (18:14 -0700)]
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
Change-Id: Ibef01983891377b859d28cff801f48ef5d8eabb2
Elliott Hughes [Fri, 18 Apr 2014 23:20:21 +0000 (23:20 +0000)]
am
90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."
* commit '
90840ec29dec173f5fbc8197bcf1889bde5bd262':
Fix warning introduced by recent psuedolocalizer change.
Elliott Hughes [Fri, 18 Apr 2014 23:16:43 +0000 (23:16 +0000)]
Merge "Fix warning introduced by recent psuedolocalizer change."
Elliott Hughes [Fri, 18 Apr 2014 23:15:27 +0000 (16:15 -0700)]
Fix warning introduced by recent psuedolocalizer change.
Change-Id: I577caf6ca4261b3d044b18bc8c5915012168031d
Elliott Hughes [Fri, 18 Apr 2014 22:36:32 +0000 (22:36 +0000)]
am
92b2d5a6: Merge "Pseudolocalizer improvements."
* commit '
92b2d5a608f9fefc9a88eea03cd599a26c1b62ce':
Pseudolocalizer improvements.
Elliott Hughes [Fri, 18 Apr 2014 22:32:53 +0000 (22:32 +0000)]
Merge "Pseudolocalizer improvements."
Mark Salyzyn [Fri, 18 Apr 2014 15:02:48 +0000 (15:02 +0000)]
am
5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
* commit '
5a47a9f62dd9bcb6573555b7a3ef4b1f5e485fc4':
Native Runtime: Add LOG_ID_CRASH
Mark Salyzyn [Fri, 18 Apr 2014 14:55:31 +0000 (14:55 +0000)]
Merge "Native Runtime: Add LOG_ID_CRASH"
Mark Salyzyn [Fri, 18 Apr 2014 00:43:36 +0000 (00:43 +0000)]
am
da93c60d: Merge "jni: binder ptrdiff_t compile issues"
* commit '
da93c60d8a5b79f90d44408d992fb532eaaf8fa7':
jni: binder ptrdiff_t compile issues