OSDN Git Service
Baligh Uddin [Wed, 23 Apr 2014 02:08:22 +0000 (02:08 +0000)]
am
d14bb3cf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
d14bb3cfb95e5bebb181ec9ed08295f25b87a94f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:19 +0000 (02:08 +0000)]
am
abd2a4a4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
abd2a4a44923c28111bdf9ccb59e5557f0deafeb':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:13 +0000 (02:08 +0000)]
am
c2c527a6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
c2c527a6f4b3629ea271ef5444292a02e2d9a17e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:10 +0000 (02:08 +0000)]
am
13c48fba: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
13c48fba164a977bbf4ef64434427bab297421bf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:07 +0000 (02:08 +0000)]
am
611dd7b7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
611dd7b70a809ac766e4e1675a4ae1a115cf6cdf':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:04 +0000 (02:08 +0000)]
am
4516c695: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
4516c695b2d8fdbc7dc0427a98841805e47f1e16':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:08:00 +0000 (02:08 +0000)]
am
2d45d4de: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
2d45d4de489563907aebe8bb29c3b965749fe81e':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:57 +0000 (02:07 +0000)]
am
5eb7136d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
5eb7136de95111983bef2357e2543730f66cde03':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:54 +0000 (02:07 +0000)]
am
71b82aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
71b82aedca5c8d38bed8f3f75d3c71f82cedcd3b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:51 +0000 (02:07 +0000)]
am
2d6e077d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
2d6e077d1db0da9a008ff6014ebbb555c30a7c47':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:48 +0000 (02:07 +0000)]
am
42c0488a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
42c0488a4b4db802161dc60a0bd16d2e5bc6afbe':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:07:45 +0000 (02:07 +0000)]
am
9dbd2eeb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
9dbd2eebf9095c4513b333a1ccce12e7d4523bd1':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:01:08 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:01:06 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:01:03 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:01:02 +0000 (02:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:59 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:57 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:55 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:54 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:49 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:47 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:43 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 02:00:41 +0000 (02:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Jeff Brown [Wed, 23 Apr 2014 01:22:26 +0000 (01:22 +0000)]
am
3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
* commit '
3af392674969b17cd3719f49ae597c7dc6ee6614':
Fix HDMI hotplug display blanking behavior.
Jeff Brown [Wed, 23 Apr 2014 01:20:01 +0000 (01:20 +0000)]
Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev
Jeff Brown [Wed, 23 Apr 2014 01:07:24 +0000 (18:07 -0700)]
Fix HDMI hotplug display blanking behavior.
Bug:
14109146
Change-Id: Ie7de4fb05da210e8c74c795f7896cf9951701aeb
Baligh Uddin [Wed, 23 Apr 2014 00:12:07 +0000 (17:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae8e8f588200714d11fe7dced5aab7ec63181e8f
Auto-generated-cl: translation import
Ying Wang [Wed, 23 Apr 2014 00:11:52 +0000 (00:11 +0000)]
am
d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev
* commit '
d0dc898119fc43de89ff41e39d37961dacab4eaa':
Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
Baligh Uddin [Wed, 23 Apr 2014 00:11:22 +0000 (17:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf24bec3b74bbe1abc88c2a3c2da451be9ed5c02
Auto-generated-cl: translation import
Ying Wang [Wed, 23 Apr 2014 00:10:01 +0000 (00:10 +0000)]
Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev
Baligh Uddin [Wed, 23 Apr 2014 00:09:18 +0000 (17:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3106f51a639078291c298ca4bbd75062e788a313
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Apr 2014 00:08:37 +0000 (17:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1aa31fe5b005c2cdef0b250806d682141cdf4fc3
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Apr 2014 00:05:01 +0000 (17:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I236254c3ae3302004f19821a7d7022ae49f6e908
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Apr 2014 00:04:17 +0000 (17:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia514ffa26785292a7659a5e3950cc3125d50736e
Auto-generated-cl: translation import
Baligh Uddin [Wed, 23 Apr 2014 00:03:26 +0000 (17:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5867f9bda8854f34ee138c135c46219d36e9be49
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Apr 2014 23:39:03 +0000 (16:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib7d1feda99c656bcea0c0efc41e9f04bda7049b9
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Apr 2014 23:37:07 +0000 (16:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6ac555548303cd6b32be846c0479bbe78a977c3a
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Apr 2014 23:36:32 +0000 (16:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iae11d6890917425aa6c6269d46372f4e6d6c08a2
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Apr 2014 23:35:44 +0000 (16:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I757cae4af2ba6dfac51383bf48f17708e44adf6f
Auto-generated-cl: translation import
Baligh Uddin [Tue, 22 Apr 2014 23:35:06 +0000 (16:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idc8ada2c34c0846b4ad8c3094e78d6beff2cc38e
Auto-generated-cl: translation import
Deepanshu Gupta [Tue, 22 Apr 2014 23:15:05 +0000 (23:15 +0000)]
am
cf5c3fc7: am
53b7df19: Merge "Add missing ICU_Delegate methods."
* commit '
cf5c3fc70d4dcd5dc3c6054d0f7415ded0070e4f':
Add missing ICU_Delegate methods.
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."
Victoria Lease [Tue, 22 Apr 2014 22:57:29 +0000 (22:57 +0000)]
am
df64ac68: ask skia to use flat gamma when rendering fonts from hwui
* commit '
df64ac688d400c74438db091952d236fffd5f778':
ask skia to use flat gamma when rendering fonts from hwui
Victoria Lease [Tue, 22 Apr 2014 22:00:31 +0000 (15:00 -0700)]
ask skia to use flat gamma when rendering fonts from hwui
Bug:
13748392
Change-Id: I6930629b8e900628f15354f663b86dfb29a4db78
(cherry picked from commit
b66270eac288de53207e55d10879b070a0ec8b6b)
Ying Wang [Tue, 22 Apr 2014 22:20:16 +0000 (15:20 -0700)]
Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
It looks like a Javac bug.
Bug:
14255510
Change-Id: Id3899994226049ff77854fd2a13a6d1b687a0392
Nick Kralevich [Tue, 22 Apr 2014 21:15:10 +0000 (21:15 +0000)]
am
5246f459: am
d267c1a0: Merge "remove unneeded import statements."
* commit '
5246f4599a0c9978012ffb1049307704b5027a0b':
remove unneeded import statements.
Nick Kralevich [Tue, 22 Apr 2014 21:14:59 +0000 (21:14 +0000)]
am
3ab7882a: am
a67d4a6e: Merge "remove unused import."
* commit '
3ab7882a57d3c7a0e13f58837cd02138df43f301':
remove unused import.
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
Justin Koh [Tue, 22 Apr 2014 17:06:56 +0000 (17:06 +0000)]
am
3b9a3cc0: Update GlobalActions for watches.
* commit '
3b9a3cc02ecb025f8b1f322015c7d1fb46222f9e':
Update GlobalActions for watches.
Justin Koh [Tue, 22 Apr 2014 00:50:40 +0000 (17:50 -0700)]
Update GlobalActions for watches.
Update GlobalActions for watches: only have power off and settings, due to
limited real estate.
Change-Id: Ie3cbbb287f8c71c8c16a00637c83da6921d56e2e
Baligh Uddin [Tue, 22 Apr 2014 14:49:14 +0000 (14:49 +0000)]
am
04acf38c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
04acf38ce281f86bd0f28485405c59e489657dfb':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Apr 2014 14:46:28 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Andrew Solovay [Tue, 22 Apr 2014 13:36:44 +0000 (13:36 +0000)]
am
da1a10f7: am
c68e2089: am
3555e4ae: Fixed a typo in a code sample.
* commit '
da1a10f727746f9f85c576adb2c4c91c552255f3':
Fixed a typo in a code sample.
Guang Zhu [Tue, 22 Apr 2014 13:27:56 +0000 (13:27 +0000)]
am
6c0454ec: Merge "add bt instrumentation to run as a util" into klp-modular-dev
* commit '
6c0454ecae4fe46b7032299d02fc6da80f171ed2':
add bt instrumentation to run as a util
Craig Mautner [Tue, 22 Apr 2014 13:27:53 +0000 (13:27 +0000)]
am
6985badc: Fix black ActivityView
* commit '
6985badc632f2ff8425aa86423577a96eafc49e9':
Fix black ActivityView
Craig Mautner [Tue, 22 Apr 2014 13:27:49 +0000 (13:27 +0000)]
am
6cdf51f2: Don\'t use finalize on ActivityView to cleanup.
* commit '
6cdf51f21df1ca2397618635767e6e53a65799ad':
Don't use finalize on ActivityView to cleanup.
Craig Mautner [Tue, 22 Apr 2014 13:27:44 +0000 (13:27 +0000)]
am
f4c909bc: Fix ActivityView lifecycle
* commit '
f4c909bcb87d6f103c9f9e8255fa61bd86f4de67':
Fix ActivityView lifecycle
Andrew Solovay [Tue, 22 Apr 2014 13:27:09 +0000 (13:27 +0000)]
am
c68e2089: am
3555e4ae: Fixed a typo in a code sample.
* commit '
c68e2089755dc35b34d620944bcceb63e1283015':
Fixed a typo in a code sample.
Andrew Solovay [Tue, 22 Apr 2014 13:20:44 +0000 (13:20 +0000)]
am
3555e4ae: Fixed a typo in a code sample.
* commit '
3555e4aef0d5664645e35d33779bf1bd140a7e50':
Fixed a typo in a code sample.
Guang Zhu [Tue, 22 Apr 2014 03:33:47 +0000 (03:33 +0000)]
Merge "add bt instrumentation to run as a util" into klp-modular-dev
Guang Zhu [Tue, 22 Apr 2014 02:06:17 +0000 (19:06 -0700)]
add bt instrumentation to run as a util
some bt test util methods are useful as device setup util, this
change exposes some of them via a BluetoothInstrumentation so
that they can be invoked like commands for setting up or
controlling bt state in test harness
Change-Id: I1d40baf374e145ab550ae4fa5f581e2eaf2e29bb
Andrew Solovay [Mon, 21 Apr 2014 20:30:10 +0000 (13:30 -0700)]
Fixed a typo in a code sample.
Fix is staged to: http://asolovay.mtv.corp.google.com:9000/guide/topics/ui/actionbar.html#Dropdown
Bug:
14043905
Change-Id: I8b71d55d51bf88ab9790309e6e63e755d03b2c85
Craig Mautner [Mon, 21 Apr 2014 22:22:06 +0000 (15:22 -0700)]
Fix black ActivityView
Don't add the surface to the VirtualDisplay until the activity
has drawn. That will keep the TextureView from turning black.
Fixes bug
12821632.
Change-Id: Ia06e9f91be3e14ad724f735ae4e201ac798863a2
Craig Mautner [Sat, 19 Apr 2014 21:56:31 +0000 (14:56 -0700)]
Don't use finalize on ActivityView to cleanup.
Use a static object to contain the IActivityContainer reference
rather than storing it directly in the ActivityView itself. Then
when the ActivityView gives up the reference we can use a clean
finalize() call to release the IActivityContainer.
Fixes bug
14184756.
Change-Id: I7e05fcce3040b2b958f7c9cd030d5e3b745f3169
Craig Mautner [Fri, 18 Apr 2014 01:39:38 +0000 (18:39 -0700)]
Fix ActivityView lifecycle
Major changes to maintain the VirtualDisplay across repeated
attach/detach cycles of an ActivityView. This keeps the activities
and VirtualDisplays in the ActivityView from getting into bad states.
Fixes bug
14107002.
Change-Id: Idc2aaf85ac496eab0eeb436736cb10a2020040e8
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
Jeff Tinker [Mon, 21 Apr 2014 21:02:28 +0000 (21:02 +0000)]
am
72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev
* commit '
72eec7f6c9509fb86f46fbdb619523efacb8d02e':
Allow DRM plugins to be destroyed when released
Jeff Tinker [Mon, 21 Apr 2014 20:58:49 +0000 (20:58 +0000)]
Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev
Adam Lesinski [Mon, 21 Apr 2014 20:21:13 +0000 (20:21 +0000)]
am
370cda70: Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev
* commit '
370cda7074a02139fa5374bbdd94c37be376ca7a':
Allow InputEvents to propagate w/o IME
Adam Lesinski [Mon, 21 Apr 2014 20:18:11 +0000 (20:18 +0000)]
Merge "Allow InputEvents to propagate w/o IME" into klp-modular-dev
Jesse Hall [Mon, 21 Apr 2014 19:46:01 +0000 (19:46 +0000)]
am
650a8860: am
fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."
* commit '
650a8860d9732accd938a32f99179cc86f101ef4':
EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.
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."
Ariel Gertzenstein [Mon, 21 Apr 2014 18:47:40 +0000 (18:47 +0000)]
am
fe755054: Merge "DO NOT MERGE Tear down PAN if we can\'t successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev
* commit '
fe7550548d036b6c536840fd1daa954160d0b2c8':
DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection.
Ariel Gertzenstein [Mon, 21 Apr 2014 18:41:53 +0000 (18:41 +0000)]
Merge "DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request after establishing a PANU connection." into klp-modular-dev
Ariel Gertzenstein [Thu, 3 Apr 2014 03:36:57 +0000 (20:36 -0700)]
DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request
after establishing a PANU connection.
http://b/
13731957
Change-Id: I0c808d5196c66783b52942ba7b7212bdce9f1c07
Baligh Uddin [Mon, 21 Apr 2014 18:19:33 +0000 (11:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieb3e0b6128807111d32faa3681839723fd47e8f1
Auto-generated-cl: translation import
Mike Lockwood [Mon, 21 Apr 2014 16:44:49 +0000 (16:44 +0000)]
am
eaabdce0: am
ca1f8f6d: am
c4367721: MTP: Fix getThumbnail
* commit '
eaabdce0ad556a91ccf731d042edfd9c5f249f5e':
MTP: Fix getThumbnail
Mike Lockwood [Mon, 21 Apr 2014 16:40:18 +0000 (16:40 +0000)]
am
ca1f8f6d: am
c4367721: MTP: Fix getThumbnail
* commit '
ca1f8f6d14a144dde64112cd471df5e9539ad521':
MTP: Fix getThumbnail
Mike Lockwood [Mon, 21 Apr 2014 16:31:51 +0000 (16:31 +0000)]
am
c4367721: MTP: Fix getThumbnail
* commit '
c436772120ceea1d6e3f5b388ef068c99c8bb7d6':
MTP: Fix getThumbnail
Mike Lockwood [Mon, 21 Apr 2014 15:49:30 +0000 (08:49 -0700)]
MTP: Fix getThumbnail
The thumbnail size was not being passed to the MTP stack so getThumbnail
was returning zero length data.
Bug:
13747419
Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
Ying Wang [Mon, 21 Apr 2014 13:45:33 +0000 (13:45 +0000)]
am
9df9ad7e: am
2a52862d: Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs."
* commit '
9df9ad7e29aecf88fdeb026bda07963ab6789396':
Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs.
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."
Kenny Root [Sat, 19 Apr 2014 00:02:04 +0000 (00:02 +0000)]
am
0090082e: resolved conflicts for merge of
89a086c1 to klp-modular-dev
* commit '
0090082ed040dd3ea897cf13d7e837dadd06ca3f':
Use hidden API to validate APK chains
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:26:16 +0000 (23:26 +0000)]
am
cf4d85e4: am
90840ec2: Merge "Fix warning introduced by recent psuedolocalizer change."
* commit '
cf4d85e4786beb98743eac68b71d67e36f76c058':
Fix warning introduced by recent psuedolocalizer change.
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
Kenny Root [Fri, 18 Apr 2014 23:15:13 +0000 (16:15 -0700)]
resolved conflicts for merge of
89a086c1 to klp-modular-dev
Change-Id: Iaa82bfc87fb3af2e8e78597c6f2517e7dad7c130
Kenny Root [Fri, 18 Apr 2014 23:05:30 +0000 (23:05 +0000)]
am
cf677a37: am
e00c9185: am
41ec218e: am
6888bee5: am
5a0cc789: am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
cf677a37fb4560058fe29ebcac97f2c02bd55064':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 23:00:37 +0000 (23:00 +0000)]
am
e00c9185: am
41ec218e: am
6888bee5: am
5a0cc789: am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
e00c9185262c675f1680920c258413299995042a':
Use hidden API to validate APK chains
OSDN Git Service
