OSDN Git Service
Dave Platt [Tue, 7 Jan 2014 19:55:47 +0000 (19:55 +0000)]
am
3bbf7e6a: am
62bac75d: am
76e5ca81: Fix descriptor leak after accepting connections
* commit '
3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8':
Fix descriptor leak after accepting connections
Dave Platt [Tue, 7 Jan 2014 19:55:43 +0000 (19:55 +0000)]
am
bd9acc22: am
e966e577: am
02f042dd: Fix socket descriptor leak from Zygote to child app
* commit '
bd9acc2218fcf3cd6605554a45db2251753ddd7b':
Fix socket descriptor leak from Zygote to child app
Dave Platt [Tue, 7 Jan 2014 19:53:12 +0000 (11:53 -0800)]
am
62bac75d: am
76e5ca81: Fix descriptor leak after accepting connections
* commit '
62bac75d677de5398b48487e758dcbdf7bc9d834':
Fix descriptor leak after accepting connections
Dave Platt [Tue, 7 Jan 2014 19:53:07 +0000 (11:53 -0800)]
am
e966e577: am
02f042dd: Fix socket descriptor leak from Zygote to child app
* commit '
e966e5774ad8d478bc89b541bcac3740fe267d18':
Fix socket descriptor leak from Zygote to child app
Dave Platt [Tue, 7 Jan 2014 19:49:54 +0000 (11:49 -0800)]
am
76e5ca81: Fix descriptor leak after accepting connections
* commit '
76e5ca81b3ba5a4f52126f2ec8907679b4356292':
Fix descriptor leak after accepting connections
Dave Platt [Tue, 7 Jan 2014 19:49:49 +0000 (11:49 -0800)]
am
02f042dd: Fix socket descriptor leak from Zygote to child app
* commit '
02f042ddd9ddf47ef88c4f174eb19a9bee296a45':
Fix socket descriptor leak from Zygote to child app
Narayan Kamath [Tue, 7 Jan 2014 13:04:19 +0000 (13:04 +0000)]
am
0dce19ca: am
79ceb53a: am
c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '
0dce19caf81c3e2090e80800957216c1d5fe66b8':
AArch64: Use long for pointers in MTP classes
Narayan Kamath [Tue, 7 Jan 2014 13:04:14 +0000 (13:04 +0000)]
am
23ebc24e: am
08467c57: am
9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '
23ebc24eee4bf8b58405daab177e46d8e3da790f':
AArch64: Use long for pointers in VideoEditor classes
Narayan Kamath [Tue, 7 Jan 2014 13:04:10 +0000 (13:04 +0000)]
am
e7d7908c: am
02baba25: am
67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '
e7d7908c28adf77de2cefba4f2a554b770d49def':
AArch64: Use long for pointers in DisplayEventReceiver
Narayan Kamath [Tue, 7 Jan 2014 13:04:06 +0000 (13:04 +0000)]
am
bfbe585e: am
c0c92f20: am
357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
* commit '
bfbe585ed4360b007640b227d49b6e8d7a2352b0':
AArch64: Use long for pointers in audio effect classes
Narayan Kamath [Tue, 7 Jan 2014 13:04:01 +0000 (13:04 +0000)]
am
568cde55: am
80cff944: am
74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '
568cde557abfaaa5bf584cf7c3396f9efd990e6c':
AArch64: Use long for pointers in AmrInputStream
Narayan Kamath [Tue, 7 Jan 2014 13:01:13 +0000 (05:01 -0800)]
am
79ceb53a: am
c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '
79ceb53ae5b867a954476e3f6499f89664fbc669':
AArch64: Use long for pointers in MTP classes
Narayan Kamath [Tue, 7 Jan 2014 13:01:08 +0000 (05:01 -0800)]
am
08467c57: am
9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '
08467c5727c04c1fef40ff1e361628944275ef28':
AArch64: Use long for pointers in VideoEditor classes
Narayan Kamath [Tue, 7 Jan 2014 13:01:03 +0000 (05:01 -0800)]
am
02baba25: am
67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '
02baba25545b232436502a73e2928a1d72fa240e':
AArch64: Use long for pointers in DisplayEventReceiver
Narayan Kamath [Tue, 7 Jan 2014 13:00:58 +0000 (05:00 -0800)]
am
c0c92f20: am
357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
* commit '
c0c92f206eddb6fb319bd11929c1703daf17248f':
AArch64: Use long for pointers in audio effect classes
Narayan Kamath [Tue, 7 Jan 2014 13:00:53 +0000 (05:00 -0800)]
am
80cff944: am
74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '
80cff94478a39914012df816179ea57c53040903':
AArch64: Use long for pointers in AmrInputStream
Narayan Kamath [Tue, 7 Jan 2014 12:58:23 +0000 (04:58 -0800)]
am
c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '
c58abeeae34c77559c00c7d967c77443469abeef':
AArch64: Use long for pointers in MTP classes
Narayan Kamath [Tue, 7 Jan 2014 12:54:46 +0000 (04:54 -0800)]
am
9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '
9bc6acf27ac446b7e18a51a926caafd99cf34713':
AArch64: Use long for pointers in VideoEditor classes
Narayan Kamath [Tue, 7 Jan 2014 12:54:42 +0000 (04:54 -0800)]
am
67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
* commit '
670327544184dbd6274de9127ceaf20dfd5801b4':
AArch64: Use long for pointers in DisplayEventReceiver
Narayan Kamath [Tue, 7 Jan 2014 12:54:35 +0000 (04:54 -0800)]
am
357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
* commit '
357ea90515025d806c6360ef846bf6f84b45a64e':
AArch64: Use long for pointers in audio effect classes
Narayan Kamath [Tue, 7 Jan 2014 12:54:11 +0000 (12:54 +0000)]
Merge "AArch64: Use long for pointers in MTP classes"
Ashok Bhat [Tue, 17 Dec 2013 19:04:19 +0000 (19:04 +0000)]
AArch64: Use long for pointers in MTP classes
For storing pointers, long is used in MTP classes,
as native pointers can be 64-bit.
In addition, 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: I67805547251722e7b77611d47d0bb632a64d3e6d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Tue, 7 Jan 2014 12:50:56 +0000 (04:50 -0800)]
am
74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '
74675f29133ff36dccc95387392bf3654dc94e15':
AArch64: Use long for pointers in AmrInputStream
Narayan Kamath [Tue, 7 Jan 2014 12:50:07 +0000 (12:50 +0000)]
Merge "AArch64: Use long for pointers in VideoEditor classes"
Ashok Bhat [Tue, 17 Dec 2013 14:13:08 +0000 (14:13 +0000)]
AArch64: Use long for pointers in VideoEditor classes
For storing pointers, long is used in VideoEditor
classes, as native pointers can be 64-bit.
In addition, 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: Ifff3a28f2ab6774ee89d31770ad63451c8726431
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Tue, 7 Jan 2014 12:49:27 +0000 (12:49 +0000)]
Merge "AArch64: Use long for pointers in DisplayEventReceiver"
Ashok Bhat [Wed, 18 Dec 2013 18:00:05 +0000 (18:00 +0000)]
AArch64: Use long for pointers in DisplayEventReceiver
For storing pointers, long is used as
native pointers can be 64-bit.
In addition, 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: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Narayan Kamath [Tue, 7 Jan 2014 12:48:21 +0000 (12:48 +0000)]
Merge "AArch64: Use long for pointers in audio effect classes"
Ashok Bhat [Tue, 17 Dec 2013 12:42:00 +0000 (12:42 +0000)]
AArch64: Use long for pointers in audio effect classes
For storing pointers, long is used in AudioEffect
and Visualizer classes, as native pointers can be 64-bit.
In addition, 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: Ief49bbe5baef663e268c7f6d70ac33a4df45621c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Tue, 7 Jan 2014 12:45:06 +0000 (12:45 +0000)]
Merge "AArch64: Use long for pointers in AmrInputStream"
Ashok Bhat [Tue, 17 Dec 2013 14:10:25 +0000 (14:10 +0000)]
AArch64: Use long for pointers in AmrInputStream
For storing pointers, long is used in AmrInputStream
class, as native pointers can be 64-bit.
Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Tue, 7 Jan 2014 10:10:49 +0000 (10:10 +0000)]
am
c47b7d37: am
9d4ebdca: am
cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '
c47b7d377c4785f84a22c42c6a99716cceb5973c':
XmlUtils#readThisMapXml should handle null keys.
Narayan Kamath [Tue, 7 Jan 2014 10:10:45 +0000 (10:10 +0000)]
am
c797fd61: am
c9e27802: am
7e296254: Merge "Fix broken XML parsing idiom."
* commit '
c797fd614d28a0c5c3aacbff325e9de572d7f091':
Fix broken XML parsing idiom.
Narayan Kamath [Tue, 7 Jan 2014 10:08:02 +0000 (02:08 -0800)]
am
9d4ebdca: am
cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '
9d4ebdcafaa6a3f29978a7095f2bc3cbe0d5240a':
XmlUtils#readThisMapXml should handle null keys.
Narayan Kamath [Tue, 7 Jan 2014 10:07:56 +0000 (02:07 -0800)]
am
c9e27802: am
7e296254: Merge "Fix broken XML parsing idiom."
* commit '
c9e27802f049b9c3086770a7710b421ce33d2791':
Fix broken XML parsing idiom.
Narayan Kamath [Tue, 7 Jan 2014 10:05:39 +0000 (02:05 -0800)]
am
cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
* commit '
cf1aa551eed7be4310a386b9b9e458e46847207a':
XmlUtils#readThisMapXml should handle null keys.
Narayan Kamath [Tue, 7 Jan 2014 10:05:35 +0000 (02:05 -0800)]
am
7e296254: Merge "Fix broken XML parsing idiom."
* commit '
7e29625463e6034147c24992d0ad319ddf426088':
Fix broken XML parsing idiom.
Narayan Kamath [Tue, 7 Jan 2014 10:03:20 +0000 (10:03 +0000)]
Merge "XmlUtils#readThisMapXml should handle null keys."
Narayan Kamath [Tue, 7 Jan 2014 10:02:57 +0000 (10:02 +0000)]
Merge "Fix broken XML parsing idiom."
quddusc [Tue, 7 Jan 2014 00:37:50 +0000 (00:37 +0000)]
am
fd08cd48: am
0d4068ad: am
ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477" into klp-docs
* commit '
fd08cd4852e285434e9067e09cad41bef28068ca':
docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477
Baligh Uddin [Tue, 7 Jan 2014 00:37:46 +0000 (00:37 +0000)]
am
be24e41b: (-s ours) am
2c4d6d91: (-s ours) am
fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
be24e41b41e9ccec3bb685baf9dc951b386116ee':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 00:37:41 +0000 (00:37 +0000)]
am
f256f49f: (-s ours) am
258bd63f: (-s ours) am
6e15a49e: (-s ours) Import translations. DO NOT MERGE
* commit '
f256f49f9fddbd035375ea8c6444cf7fa36418ca':
Import translations. DO NOT MERGE
quddusc [Tue, 7 Jan 2014 00:30:35 +0000 (16:30 -0800)]
am
0d4068ad: am
ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477" into klp-docs
* commit '
0d4068ad1cbc8b8c550118c2214eb70116b83f81':
docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477
Baligh Uddin [Tue, 7 Jan 2014 00:30:30 +0000 (16:30 -0800)]
am
2c4d6d91: (-s ours) am
fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 00:30:25 +0000 (16:30 -0800)]
am
258bd63f: (-s ours) am
6e15a49e: (-s ours) Import translations. DO NOT MERGE
* commit '
258bd63f38d90ac96aac5eb4e3a5c696e8b089f8':
Import translations. DO NOT MERGE
Conley Owens [Mon, 6 Jan 2014 23:46:00 +0000 (23:46 +0000)]
am
7f16047b: am
73a6702e: am
4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '
7f16047b9efeba7cf82690b0492eaed44ca017df':
CompoundButton: Let text can be changed by config
Conley Owens [Mon, 6 Jan 2014 23:41:50 +0000 (15:41 -0800)]
am
73a6702e: am
4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '
73a6702eeaabdeb7b405ec504413d41716ef3508':
CompoundButton: Let text can be changed by config
Conley Owens [Mon, 6 Jan 2014 23:38:05 +0000 (15:38 -0800)]
am
4440a824: Merge "CompoundButton: Let text can be changed by config"
* commit '
4440a8244ea4fdd7c63083bcd7d4b179e851c17a':
CompoundButton: Let text can be changed by config
Conley Owens [Mon, 6 Jan 2014 23:36:02 +0000 (23:36 +0000)]
Merge "CompoundButton: Let text can be changed by config"
Dave Platt [Fri, 6 Dec 2013 22:03:47 +0000 (14:03 -0800)]
Fix descriptor leak after accepting connections
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.
Bug:
11805817
(cherry picked from commit
3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d)
Change-Id: I723d7c5544ee4b6858894c215716cbc32a958df1
Dave Platt [Thu, 12 Dec 2013 23:45:49 +0000 (15:45 -0800)]
Fix socket descriptor leak from Zygote to child app
Due to an API change in LocalSocket, Zygote must now
manually close the FileDescriptor it created when it
registered a LocalServerSocket. The LocalSocket.close()
routine will no longer do so.
Bug:
12114500
(cherry picked from commit
70ef29b04ee4ef7d7acfec79041dbe800961195e)
Change-Id: Ief23a3c99e007dc4aa6f94dfb47a1b2b6c854dad
quddusc [Mon, 6 Jan 2014 21:58:03 +0000 (21:58 +0000)]
am
ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477" into klp-docs
* commit '
ff65ca29a00aa282160dd8a77cdd6ed6855abba7':
docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477
quddusc [Mon, 6 Jan 2014 21:55:28 +0000 (21:55 +0000)]
Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug:
7044477" into klp-docs
Baligh Uddin [Mon, 6 Jan 2014 21:47:50 +0000 (13:47 -0800)]
am
fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
fd8be467a38eded82d17740824cf87daa38e25e0':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Jan 2014 21:47:46 +0000 (13:47 -0800)]
am
6e15a49e: (-s ours) Import translations. DO NOT MERGE
* commit '
6e15a49eee1398aaf73f6b994b4148b198b67430':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 6 Jan 2014 21:45:15 +0000 (21:45 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 6 Jan 2014 21:15:51 +0000 (13:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic05c1c30830a0c9d7cb62fd53f6b144650e05609
Auto-generated-cl: translation import
Baligh Uddin [Mon, 6 Jan 2014 20:16:37 +0000 (12:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iad53d8fd9f6b72114c8ab0444d60e8fed54f1df9
Auto-generated-cl: translation import
Raph Levien [Mon, 6 Jan 2014 17:08:56 +0000 (17:08 +0000)]
am
7b6b85d2: am
d7d07498: am
a980c7aa: Merge "Re-initialize error after attach"
* commit '
7b6b85d260fb4fe739e0af0cc0328e0678872899':
Re-initialize error after attach
Raph Levien [Mon, 6 Jan 2014 17:06:06 +0000 (09:06 -0800)]
am
d7d07498: am
a980c7aa: Merge "Re-initialize error after attach"
* commit '
d7d0749805b6ae8bb345731ac9dd960f6b5aa5dd':
Re-initialize error after attach
Raph Levien [Mon, 6 Jan 2014 17:04:03 +0000 (09:04 -0800)]
am
a980c7aa: Merge "Re-initialize error after attach"
* commit '
a980c7aa3ec901b7c4201776a9a4e3a5fc3e50df':
Re-initialize error after attach
Raph Levien [Mon, 6 Jan 2014 17:00:49 +0000 (17:00 +0000)]
Merge "Re-initialize error after attach"
Narayan Kamath [Mon, 6 Jan 2014 11:31:35 +0000 (11:31 +0000)]
Fix broken XML parsing idiom.
Code that expected a single top level element in an XML file
was doing something like :
while (type != START_TAG) { next(); }
This would loop forever when the XML being parsed was empty,
where each call to XmlPullParser.next() would return END_DOCUMENT.
bug: https://code.google.com/p/android/issues/detail?id=64173
Change-Id: I7543203e976a8999ae471a6c2d629249a87011bb
Narayan Kamath [Wed, 18 Dec 2013 15:19:17 +0000 (15:19 +0000)]
XmlUtils#readThisMapXml should handle null keys.
Both readThisValueXml & writeThisValueXml have been
implemented to handle values with "null" names.
Change readThisMapXml to allow such names as well, and
map them to the null key in the resulting HashMap.
readThisListXml and readThisSetXml already support
null names.
bug: https://code.google.com/p/android/issues/detail?id=63463
Change-Id: I1c93976656e45e7733113eb67d29b6bad5d25f1f
Todd Poynor [Thu, 11 Jul 2013 02:15:07 +0000 (19:15 -0700)]
ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
Katie McCormick [Fri, 3 Jan 2014 21:18:21 +0000 (21:18 +0000)]
am
406fb742: am
65f5d74e: am
048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs
* commit '
406fb742f461e3deda83984a47e66fc6bccacc78':
Doc update: update console instructions per new UI.
Katie McCormick [Fri, 3 Jan 2014 21:15:23 +0000 (13:15 -0800)]
am
65f5d74e: am
048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs
* commit '
65f5d74eada8937d68c821ff4f1c609e16613d22':
Doc update: update console instructions per new UI.
Katie McCormick [Fri, 3 Jan 2014 21:12:42 +0000 (21:12 +0000)]
am
048895b5: Merge "Doc update: update console instructions per new UI." into klp-docs
* commit '
048895b5a0532fef394a4a3f07af737f8d733335':
Doc update: update console instructions per new UI.
Katie McCormick [Fri, 3 Jan 2014 21:09:37 +0000 (21:09 +0000)]
Merge "Doc update: update console instructions per new UI." into klp-docs
quddusc [Thu, 2 Jan 2014 19:39:02 +0000 (11:39 -0800)]
docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI.
Bug:
7044477
Change-Id: I722dc2e47c8dbe0cba48e44434d62fe28f23714f
Baligh Uddin [Mon, 30 Dec 2013 18:52:29 +0000 (18:52 +0000)]
am
bb23697a: (-s ours) am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
bb23697a7e2ad4568d402e7efe006fc4ac650749':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:49:56 +0000 (10:49 -0800)]
am
d58d91ef: (-s ours) am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
d58d91ef8296a75e07fa7b9b78dd6d9f5dd72015':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 18:47:12 +0000 (10:47 -0800)]
am
2ae0419f: (-s ours) Import translations. DO NOT MERGE
* commit '
2ae0419fb1ecd7e0705b7b87f8e73d6b73869bca':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 17:30:42 +0000 (09:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I749221e72ed6ab7c58b9b606e6818c884d6c1f34
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 23:44:18 +0000 (23:44 +0000)]
am
ca7a1442: (-s ours) am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ca7a1442d0f633b663e59813957e98ef68c5f99e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:44:08 +0000 (23:44 +0000)]
am
4c60be5b: (-s ours) am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4c60be5b135dd13556e947784f20f792c1f9d568':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:44:03 +0000 (23:44 +0000)]
am
ad141bd7: (-s ours) am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ad141bd7e267c74daf33416412f9aab30e9751fa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:43:59 +0000 (23:43 +0000)]
am
b6d55917: (-s ours) am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
b6d55917122b314c4ec547263e774934d67f2973':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:43:54 +0000 (23:43 +0000)]
am
f16ddd6d: am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
f16ddd6dd4fae500b7b512568db2c55b8919d920':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:43:49 +0000 (23:43 +0000)]
am
cd73f770: am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
cd73f7702fca082bf46d64b5c011f9dbe1b5fe65':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:43:45 +0000 (23:43 +0000)]
am
317109df: am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
317109dfaf0682f6ffbf11d71f3da84dfa295df6':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:43:40 +0000 (23:43 +0000)]
am
b889885e: am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
b889885e9b5a605329ff8d7a35c373c88abf8c35':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:43:36 +0000 (23:43 +0000)]
am
5938b9a0: am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
5938b9a00e0133ca093755568c9a8a2e202f7daf':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:43:31 +0000 (23:43 +0000)]
am
39b79982: am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
39b799820db4fa258dadb45b030830656168f95b':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Baligh Uddin [Thu, 26 Dec 2013 23:34:23 +0000 (15:34 -0800)]
am
a95f6e3a: (-s ours) am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a95f6e3ac450a8df9ae90585f2c0c02726f9cb01':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:34:18 +0000 (15:34 -0800)]
am
7aa56efd: (-s ours) am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7aa56efd7399b0628bde655c535fac6407eaade9':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:34:14 +0000 (15:34 -0800)]
am
dd6517c9: (-s ours) am
ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
dd6517c9dff66a2165e147201e813e1f305425c2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 23:34:10 +0000 (15:34 -0800)]
am
e965be75: (-s ours) am
d6e863a1: (-s ours) Import translations. DO NOT MERGE
* commit '
e965be75746d898611ee15d601dc97c8b206a542':
Import translations. DO NOT MERGE
quddusc [Thu, 26 Dec 2013 23:34:03 +0000 (15:34 -0800)]
am
2a191297: am
cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs
* commit '
2a1912971849b929dc2e4ec8d6368f477b1fddae':
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug:
11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
quddusc [Thu, 26 Dec 2013 23:33:58 +0000 (15:33 -0800)]
am
5d98ddf2: am
fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
* commit '
5d98ddf2f741c2a635b9df90cf896c9faceb1b33':
docs: Fixed code snippet for unbinding from IAB v3 service. Bug:
11858905
quddusc [Thu, 26 Dec 2013 23:33:52 +0000 (15:33 -0800)]
am
e94bca2d: am
70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521" into klp-docs
* commit '
e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f':
docs: Added missing elements under "can contain:" list in manifest-element.html. Bug:
5793521
quddusc [Thu, 26 Dec 2013 23:33:47 +0000 (15:33 -0800)]
am
34dbf7c3: am
ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017" into klp-docs
* commit '
34dbf7c32327dc61a106b9a2f50e22cdb6cf6242':
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug:
6804017
quddusc [Thu, 26 Dec 2013 23:33:43 +0000 (15:33 -0800)]
am
5ad0e628: am
12182bc2: Merge "docs: Fixed deprecated constructor. Bug:
10581815" into klp-docs
* commit '
5ad0e6289119dfaaa50a663e88dc0b978447302c':
docs: Fixed deprecated constructor. Bug:
10581815
quddusc [Thu, 26 Dec 2013 23:33:37 +0000 (15:33 -0800)]
am
52604aad: am
240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."
* commit '
52604aadaafc0921c2f81df715f01bec546021a2':
docs: Changed the title of the class to "Making Your App Content Searchable by Google."
Baligh Uddin [Thu, 26 Dec 2013 21:00:44 +0000 (13:00 -0800)]
am
bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
bbeb313567064b30ad93cdadd49beb8141c3d47b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 20:58:31 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 19:11:15 +0000 (11:11 -0800)]
am
7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
7bb3e3b9ee22f2771c9fa71593c71910bbbcafac':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 19:09:48 +0000 (11:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iea7a801a62b52fd1685e7d9904a1e805c0d19827
Auto-generated-cl: translation import
Baligh Uddin [Thu, 26 Dec 2013 19:09:18 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 19:07:34 +0000 (11:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I190a7af8c85eb4b59ed14bd55f5ed2ff85e55698
Auto-generated-cl: translation import