OSDN Git Service

android-x86/frameworks-base.git
10 years agoam cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron opera...
Robert Greenwalt [Wed, 8 Jan 2014 00:44:30 +0000 (16:44 -0800)]
am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""

* commit 'cbf5e8758ff9ef2eb21228fba20c962002f1e42d':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"

10 years agoam 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when...
Robert Greenwalt [Wed, 8 Jan 2014 00:41:16 +0000 (16:41 -0800)]
am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""

* commit '517e9b11d53609d59c60d22dc085e7f9fd442248':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"

10 years agoMerge "Revert "Do not show roaming icon for Videotron operator when access Canada...
Robert Greenwalt [Wed, 8 Jan 2014 00:38:29 +0000 (00:38 +0000)]
Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""

10 years agoam c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
Ian Rogers [Tue, 7 Jan 2014 21:38:44 +0000 (13:38 -0800)]
am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"

* commit 'c2b50c10f0bf636562deba1d92ec7b54b13909de':
  Add a call to registerAppInfo for the VMRuntime

10 years agoam f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"
Ian Rogers [Tue, 7 Jan 2014 21:36:29 +0000 (13:36 -0800)]
am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime"

* commit 'f11dee797177760f089e757d91ed6bce32043750':
  Add a call to registerAppInfo for the VMRuntime

10 years agoMerge "Add a call to registerAppInfo for the VMRuntime"
Ian Rogers [Tue, 7 Jan 2014 21:31:17 +0000 (21:31 +0000)]
Merge "Add a call to registerAppInfo for the VMRuntime"

10 years agoam 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections
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

10 years agoam e966e577: am 02f042dd: Fix socket descriptor leak from Zygote to child app
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

10 years agoam 76e5ca81: Fix descriptor leak after accepting connections
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

10 years agoam 02f042dd: Fix socket descriptor leak from Zygote to child app
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

10 years agoam 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
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

10 years agoam 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor 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

10 years agoam 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
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

10 years agoam c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
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

10 years agoam 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
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

10 years agoam c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
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

10 years agoam 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor 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

10 years agoam 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver"
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

10 years agoam 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
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

10 years agoMerge "AArch64: Use long for pointers in MTP classes"
Narayan Kamath [Tue, 7 Jan 2014 12:54:11 +0000 (12:54 +0000)]
Merge "AArch64: Use long for pointers in MTP classes"

10 years agoAArch64: 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>
10 years agoam 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
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

10 years agoMerge "AArch64: Use long for pointers in VideoEditor classes"
Narayan Kamath [Tue, 7 Jan 2014 12:50:07 +0000 (12:50 +0000)]
Merge "AArch64: Use long for pointers in VideoEditor classes"

10 years agoAArch64: 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>
10 years agoMerge "AArch64: Use long for pointers in DisplayEventReceiver"
Narayan Kamath [Tue, 7 Jan 2014 12:49:27 +0000 (12:49 +0000)]
Merge "AArch64: Use long for pointers in DisplayEventReceiver"

10 years agoAArch64: 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>
10 years agoMerge "AArch64: Use long for pointers in audio effect classes"
Narayan Kamath [Tue, 7 Jan 2014 12:48:21 +0000 (12:48 +0000)]
Merge "AArch64: Use long for pointers in audio effect classes"

10 years agoAArch64: 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>
10 years agoMerge "AArch64: Use long for pointers in AmrInputStream"
Narayan Kamath [Tue, 7 Jan 2014 12:45:06 +0000 (12:45 +0000)]
Merge "AArch64: Use long for pointers in AmrInputStream"

10 years agoAArch64: 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>
10 years agoam 9d4ebdca: am cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
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.

10 years agoam c9e27802: am 7e296254: Merge "Fix broken XML parsing idiom."
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.

10 years agoam cf1aa551: Merge "XmlUtils#readThisMapXml should handle null keys."
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.

10 years agoam 7e296254: Merge "Fix broken XML parsing idiom."
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.

10 years agoMerge "XmlUtils#readThisMapXml should handle null keys."
Narayan Kamath [Tue, 7 Jan 2014 10:03:20 +0000 (10:03 +0000)]
Merge "XmlUtils#readThisMapXml should handle null keys."

10 years agoMerge "Fix broken XML parsing idiom."
Narayan Kamath [Tue, 7 Jan 2014 10:02:57 +0000 (10:02 +0000)]
Merge "Fix broken XML parsing idiom."

10 years agoam 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app...
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

10 years agoam 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam 258bd63f: (-s ours) am 6e15a49e: (-s ours) 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

10 years agoam 73a6702e: am 4440a824: Merge "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

10 years agoam 4440a824: Merge "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

10 years agoMerge "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"

10 years agoFix descriptor leak after accepting connections
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

10 years agoFix socket descriptor leak from Zygote to child app
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

10 years agoam ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test...
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

10 years agoMerge "docs: Updated instructions for setting up In-app Billing test accounts to...
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

10 years agoam fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
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

10 years agoam 6e15a49e: (-s ours) 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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Mon, 6 Jan 2014 21:45:15 +0000 (21:45 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoam d7d07498: am a980c7aa: Merge "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

10 years agoam a980c7aa: Merge "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

10 years agoMerge "Re-initialize error after attach"
Raph Levien [Mon, 6 Jan 2014 17:00:49 +0000 (17:00 +0000)]
Merge "Re-initialize error after attach"

10 years agoFix broken XML parsing idiom.
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

10 years agoXmlUtils#readThisMapXml should handle null keys.
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

10 years agoam 65f5d74e: am 048895b5: Merge "Doc update: update console instructions per new...
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.

10 years agoam 048895b5: Merge "Doc update: update console instructions per new UI." into klp...
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.

10 years agoMerge "Doc update: update console instructions per new UI." into klp-docs
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

10 years agodocs: Updated instructions for setting up In-app Billing test accounts to reflect...
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

10 years agoam d58d91ef: (-s ours) am 2ae0419f: (-s ours) 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

10 years agoam 2ae0419f: (-s ours) 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

10 years agoImport 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

10 years agoam a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam dd6517c9: (-s ours) am ea227306: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam e965be75: (-s ours) am d6e863a1: (-s ours) 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

10 years agoam 2a191297: am cbc5f541: Merge "docs: Added a statement for "android:name" attribute...
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

10 years agoam 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service...
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

10 years agoam e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain...
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

10 years agoam 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged...
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

10 years agoam 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815...
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

10 years agoam 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App...
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."

10 years agoam bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 20:58:31 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 7bb3e3b9: (-s ours) 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

10 years agoImport 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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 19:09:18 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
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

10 years agoam ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 18:43:19 +0000 (10:43 -0800)]
am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'ea227306d68c7097b9cb079b1bfa6157c1ec2d30':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Thu, 26 Dec 2013 18:41:55 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 18:16:09 +0000 (10:16 -0800)]
Import translations. DO NOT MERGE

Change-Id: I010c6031e2bb9bfe71261008db8945116088a590
Auto-generated-cl: translation import

10 years agoam d6e863a1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 17:59:57 +0000 (09:59 -0800)]
am d6e863a1: (-s ours) Import translations. DO NOT MERGE

* commit 'd6e863a19a631fd0003f96d507a21863fe973caa':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 26 Dec 2013 17:53:23 +0000 (09:53 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia1e9dd788744e22237845d094d414dc4f57713be
Auto-generated-cl: translation import

10 years agoam cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating...
quddusc [Sat, 21 Dec 2013 00:15:55 +0000 (00:15 +0000)]
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 'cbc5f5410ff7c2b91e13f80a930f22944ce2ed88':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2

10 years agoam fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
quddusc [Sat, 21 Dec 2013 00:15:49 +0000 (00:15 +0000)]
am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905

* commit 'fca563a2d600c2e2a4ca0af2446a72e8bb36206e':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905

10 years agoMerge "docs: Added a statement for "android:name" attribute indicating that the descr...
quddusc [Sat, 21 Dec 2013 00:13:56 +0000 (00:13 +0000)]
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

10 years agodocs: Fixed code snippet for unbinding from IAB v3 service.
quddusc [Fri, 20 Dec 2013 23:21:38 +0000 (15:21 -0800)]
docs: Fixed code snippet for unbinding from IAB v3 service.
Bug: 11858905

Change-Id: Id1af4fc50a020ab520b2c836df8182db6c3a35bd

10 years agodocs: Added a statement for "android:name" attribute indicating that the descriptor...
quddusc [Fri, 20 Dec 2013 23:12:58 +0000 (15:12 -0800)]
docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive.
Bug: 11926096
Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2

10 years agoam 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifes...
quddusc [Fri, 20 Dec 2013 23:10:33 +0000 (23:10 +0000)]
am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs

* commit '70b96ec7303c1b34ff9d63a03359efadeec075c2':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521

10 years agoam ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState...
quddusc [Fri, 20 Dec 2013 23:10:28 +0000 (23:10 +0000)]
am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs

* commit 'ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017

10 years agoMerge "docs: Added missing elements under "can contain:" list in manifest-element...
quddusc [Fri, 20 Dec 2013 23:08:07 +0000 (23:08 +0000)]
Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs

10 years agoMerge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter...
quddusc [Fri, 20 Dec 2013 23:07:34 +0000 (23:07 +0000)]
Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs

10 years agodocs: Added missing elements under "can contain:" list in manifest-element.html.
quddusc [Fri, 20 Dec 2013 22:44:51 +0000 (14:44 -0800)]
docs: Added missing elements under "can contain:" list in manifest-element.html.
Bug: 5793521

Change-Id: I4340a8d043ebcf80634ad8cc1967b2a476a151d8

10 years agoam 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs
quddusc [Fri, 20 Dec 2013 23:01:28 +0000 (23:01 +0000)]
am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs

* commit '12182bc236dd8e120a1f25d1a1862db744425558':
  docs: Fixed deprecated constructor. Bug: 10581815

10 years agoMerge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs
quddusc [Fri, 20 Dec 2013 22:59:05 +0000 (22:59 +0000)]
Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs

10 years agodocs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description.
quddusc [Fri, 20 Dec 2013 22:55:09 +0000 (14:55 -0800)]
docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description.
Bug: 6804017

Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0

10 years agodocs: Fixed deprecated constructor.
quddusc [Fri, 20 Dec 2013 22:07:45 +0000 (14:07 -0800)]
docs: Fixed deprecated constructor.
Bug: 10581815

Change-Id: I057acf1ad3037418c7247f865b6cb0847a9eb7b6

10 years agoam 240aca33: docs: Changed the title of the class to "Making Your App Content Searcha...
quddusc [Fri, 20 Dec 2013 20:37:30 +0000 (20:37 +0000)]
am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google."

* commit '240aca333e340445f977d2a0e268a7c8d3a591e0':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."

10 years agodocs: Changed the title of the class to "Making Your App Content Searchable by Google."
quddusc [Fri, 20 Dec 2013 00:59:17 +0000 (16:59 -0800)]
docs: Changed the title of the class to "Making Your App Content Searchable by Google."

Change-Id: Icc640ffffc553c5e8825178453515cedcdc8a63f