git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Dave Holmes [Wed, 4 Jun 2014 23:41:49 +0000 (23:41 +0000)]

am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to

* commit '4e99af342b340bebcd635137966d21c59c294532':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.

commit | commitdiff | tree

Dave Holmes [Wed, 4 Jun 2014 23:38:34 +0000 (23:38 +0000)]

am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to the Building

* commit 'aabfcb78cf29e3d670831c770b9d757eb79487e4':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.

commit | commitdiff | tree

Dave Holmes [Wed, 4 Jun 2014 23:35:50 +0000 (23:35 +0000)]

Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation." into klp-docs

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:48:19 +0000 (20:48 +0000)]

am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '03df93bcb854eedc600ef0120fd238ec974c44a1':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:45:02 +0000 (20:45 +0000)]

am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '5cde33a6ffd6a3be87f6622e67c3d83fb61519cb':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:41:47 +0000 (20:41 +0000)]

am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'dcfba78fbb4dad6792113383b2d32eff7f2c1f88':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:38:25 +0000 (20:38 +0000)]

am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:34:14 +0000 (20:34 +0000)]

am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '022d8a9f4400dc7ec2926b133fc7151d8a5c24a3':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:30:05 +0000 (20:30 +0000)]

am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'bad112f23f09f8839b4b7294439b0fe725cc2034':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:29:11 +0000 (20:29 +0000)]

am 3ce1ca68: am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '3ce1ca68309231e693964824917a66f36e575fd7':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:29:06 +0000 (20:29 +0000)]

am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev

* commit 'e4aa31382139ee2e319110fbfff402e0c6315952':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:29:03 +0000 (20:29 +0000)]

am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

* commit '88c9ca28effb9745d13647bd25d34b6ef53e7cb9':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:27:49 +0000 (20:27 +0000)]

am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'c8235b8e7446c849df10ff2f897d2a3743b4934d':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:26:07 +0000 (20:26 +0000)]

am 0ed9d498: am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '0ed9d498b740273fdbcdf51f55648c23df29accc':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:25:57 +0000 (20:25 +0000)]

am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev

* commit 'a9e8291409a916186cd96b8bc557a6ac83d6b1ae':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:25:54 +0000 (20:25 +0000)]

am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

* commit 'd49f9b25310ac63310b0e5c7aeedca1d9e6ccda0':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:21:00 +0000 (20:21 +0000)]

am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit 'ffcad247d0401fb529441ecc65437226c2845461':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:20:52 +0000 (20:20 +0000)]

am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '328b1f92787bb4d793398ba6d8aa9b2025c62ca1':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:20:51 +0000 (20:20 +0000)]

Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:20:27 +0000 (20:20 +0000)]

am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

* commit '2983ee55a6d578b15b4862c9c8523bf00f7d83d5':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:20:26 +0000 (20:20 +0000)]

Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:17:40 +0000 (20:17 +0000)]

am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '904b89c58465b0d0822478be514572ec752df3e8':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:15:37 +0000 (20:15 +0000)]

am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:15:33 +0000 (20:15 +0000)]

am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

* commit '12b657d74961ba5a6175162b7548cce4e77c9bbc':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:14:52 +0000 (20:14 +0000)]

am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:11:23 +0000 (20:11 +0000)]

am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'af3f96e4349f63f862de004853ba8e10e5ee51ae':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:11:19 +0000 (20:11 +0000)]

am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

* commit 'dade24b491c82ff0b96d025c908e7eaf1bab99ba':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:10:55 +0000 (20:10 +0000)]

am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:08:29 +0000 (20:08 +0000)]

am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 20:07:43 +0000 (20:07 +0000)]

Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:43:09 +0000 (19:43 +0000)]

am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:43:01 +0000 (12:43 -0700)]

resolved conflicts for merge of 61fb5784 to jb-mr1-dev

Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:38:01 +0000 (19:38 +0000)]

am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:34:15 +0000 (19:34 +0000)]

am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'f52fcc70541224c2d926f59461bde5a8bd6545a7':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:32:05 +0000 (19:32 +0000)]

am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Wed, 4 Jun 2014 19:31:31 +0000 (19:31 +0000)]

Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev

commit | commitdiff | tree

Andrew Solovay [Wed, 4 Jun 2014 17:40:03 +0000 (17:40 +0000)]

am 15ceb87a: am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs

* commit '15ceb87a07d9ad1fba4265112492e34c5cc360f5':
docs: Fixed error in code sample.

commit | commitdiff | tree

Andrew Solovay [Wed, 4 Jun 2014 17:35:45 +0000 (17:35 +0000)]

am 2e10cc90: Merge "docs: Fixed error in code sample." into klp-docs

* commit '2e10cc9021b1cd3d90c55038191872f29a02c3f2':
docs: Fixed error in code sample.

commit | commitdiff | tree

Andrew Solovay [Wed, 4 Jun 2014 17:32:46 +0000 (17:32 +0000)]

Merge "docs: Fixed error in code sample." into klp-docs

commit | commitdiff | tree

Ricardo Cervera [Wed, 4 Jun 2014 17:29:36 +0000 (17:29 +0000)]

am 693a9546: am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs

* commit '693a954626866e40b01264ff57fe6c336a7504a8':
docs: Added release notes for SDK Tools 22.6.4

commit | commitdiff | tree

Ricardo Cervera [Wed, 4 Jun 2014 17:24:35 +0000 (17:24 +0000)]

am 6e949d9c: Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs

* commit '6e949d9ca5044e5c2243fe8366d9a7ac55d57803':
docs: Added release notes for SDK Tools 22.6.4

commit | commitdiff | tree

Ricardo Cervera [Wed, 4 Jun 2014 17:21:38 +0000 (17:21 +0000)]

Merge "docs: Added release notes for SDK Tools 22.6.4" into klp-docs

commit | commitdiff | tree

Robert Ly [Wed, 4 Jun 2014 16:54:45 +0000 (16:54 +0000)]

am dd57a6b2: am bb33ff04: update device dashboard for June

* commit 'dd57a6b24d819bbfd9d2422f52dfb0fe9d43b3e9':
update device dashboard for June

commit | commitdiff | tree

Robert Ly [Wed, 4 Jun 2014 16:50:26 +0000 (16:50 +0000)]

am bb33ff04: update device dashboard for June

* commit 'bb33ff04b7d1f7f554331426bd9940edbbfd395d':
update device dashboard for June

commit | commitdiff | tree

Robert Ly [Wed, 4 Jun 2014 15:34:40 +0000 (08:34 -0700)]

update device dashboard for June

Change-Id: Ibc02e80f4d4fa721039229f63dee0af878c21765

commit | commitdiff | tree

Katie McCormick [Wed, 4 Jun 2014 12:32:09 +0000 (12:32 +0000)]

am ea5fa98c: am c659e746: Merge "Doc update: new Volley class" into klp-docs

* commit 'ea5fa98c7c381a37c113b7d2efdd6a406d902949':
Doc update: new Volley class

commit | commitdiff | tree

Katie McCormick [Wed, 4 Jun 2014 12:26:44 +0000 (12:26 +0000)]

am c659e746: Merge "Doc update: new Volley class" into klp-docs

* commit 'c659e7465df342920f3906cbc0b024f610bf65bd':
Doc update: new Volley class

commit | commitdiff | tree

Katie McCormick [Wed, 4 Jun 2014 12:01:38 +0000 (12:01 +0000)]

Merge "Doc update: new Volley class" into klp-docs

commit | commitdiff | tree

Dave Holmes [Wed, 4 Jun 2014 07:02:25 +0000 (17:02 +1000)]

Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.

https://b.corp.google.com/issue?id=14045807

Change-Id: I48e6a50f12c635cdf3dd597e4247d072bda14cc3

commit | commitdiff | tree

David Friedman [Wed, 4 Jun 2014 03:09:34 +0000 (03:09 +0000)]

am dba68be3: am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs

* commit 'dba68be33efe4ee322a9ff3d895ed257162c0908':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"

commit | commitdiff | tree

David Friedman [Wed, 4 Jun 2014 03:05:26 +0000 (03:05 +0000)]

am 00aae279: Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs

* commit '00aae2793d37ed098a80bc0a98e8008b36178714':
Fixed typos. "describe"-->"describes"; "allow"-->"allows"

commit | commitdiff | tree

David Friedman [Wed, 4 Jun 2014 03:01:52 +0000 (03:01 +0000)]

Merge "Fixed typos. "describe"-->"describes"; "allow"-->"allows"" into klp-docs

commit | commitdiff | tree

Andrew Solovay [Tue, 3 Jun 2014 23:07:59 +0000 (16:07 -0700)]

docs: Fixed error in code sample.

The code sample didn't match the sample project. Also rewrote one
paragraph to clarify that you *create* a particular XML file (external
bug report said the file was missing from the sample project).

Also fixed formatting in a different line sample (overlong line
forced code box to scroll).

Doc is staged to:
http://asolovay.mtv:9098/training/contacts-provider/retrieve-names.html#NameMatch

bug: 15377898
Change-Id: I0898956255aa9174b12811e6f6ca826434b28c20

commit | commitdiff | tree

Dirk Dougherty [Tue, 3 Jun 2014 23:18:15 +0000 (23:18 +0000)]

am 93a27e23: am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs

* commit '93a27e236b88636e68543d5edd80e5a5c176fb57':
Adjust h3 margins for dynamic content blocks.

commit | commitdiff | tree

Dirk Dougherty [Tue, 3 Jun 2014 23:13:50 +0000 (23:13 +0000)]

am 7f0c6478: Merge "Adjust h3 margins for dynamic content blocks." into klp-docs

* commit '7f0c6478ae5266be92ebfa8b0c6244f1a101ce01':
Adjust h3 margins for dynamic content blocks.

commit | commitdiff | tree

Dirk Dougherty [Tue, 3 Jun 2014 23:09:37 +0000 (23:09 +0000)]

Merge "Adjust h3 margins for dynamic content blocks." into klp-docs

commit | commitdiff | tree

Craig Mautner [Tue, 3 Jun 2014 22:41:38 +0000 (22:41 +0000)]

Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 21:17:09 +0000 (21:17 +0000)]

am 92641015: am 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '92641015c83ec027f0d06b8047804f5ffc2dc16b':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 21:10:10 +0000 (21:10 +0000)]

am 5f664a11: am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '5f664a1119f9008feeb924ec50c2ac896a8550db':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 21:06:02 +0000 (21:06 +0000)]

am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '2a57694d0ae30eeca7239c7efae4e6bf478b781a':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 21:02:55 +0000 (21:02 +0000)]

am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'e2edd753e8a58de5958b5145f9ea7d2f5484a6ca':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:58:41 +0000 (20:58 +0000)]

am 76364c69: am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '76364c6970f86bdf67622c14c9f1ebac6883998b':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:54:31 +0000 (20:54 +0000)]

am 2bc3df2e: am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '2bc3df2e3cd8e27609ca4c9f2aa1c1f3304d199d':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:54:29 +0000 (20:54 +0000)]

am 7e49737d: am fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '7e49737d80fa37731af44dff2f88a6054778f907':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:53:49 +0000 (20:53 +0000)]

am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'd0f215756aa3767db8a73ece7fe9f401256dd263':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:49:37 +0000 (20:49 +0000)]

am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '3c1d72c2ef1819e0de5599761b21f00351ca3feb':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:49:35 +0000 (20:49 +0000)]

am b97ac2b6: am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'b97ac2b6acc84b02ebe16a8c875bae5cfd0898f2':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:49:32 +0000 (20:49 +0000)]

am fb6e2f3b: am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit 'fb6e2f3b56fc067c634c122d605abe3841c309a9':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:47:34 +0000 (20:47 +0000)]

am c8414f11: (-s ours) am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'c8414f11d7738dafc530178fd6dfa365d8b3d884':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:47:30 +0000 (20:47 +0000)]

am 9bfbe93a: (-s ours) am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '9bfbe93a7e7165a7daef68175aa7dde9dbe0223a':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:43:53 +0000 (20:43 +0000)]

am 4dcb4a1f: am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '4dcb4a1f03abb2a4d3f1ceb9aed0feb6264ebfb5':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:43:50 +0000 (20:43 +0000)]

am dd46bfd0: am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit 'dd46bfd09522fa7450293bbcb2f3ae5ecc85b882':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:41:34 +0000 (20:41 +0000)]

am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'ab869de19efc24265eebda19a97628713e072178':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:39:10 +0000 (20:39 +0000)]

am 236b7164: am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '236b71649ce008578cf77557033df322e93a1e17':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:39:09 +0000 (20:39 +0000)]

am 7e0b1d59: am d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '7e0b1d59010ad69372575e5d87dc6b6f2c9486da':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:39:08 +0000 (20:39 +0000)]

am 02d88f7b: am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '02d88f7b350e166da3b1f480c912351a5c72d00c':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:36:41 +0000 (20:36 +0000)]

am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'cd192c0b1ca56af3ed3dfdb38626304de0412254':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:35:12 +0000 (20:35 +0000)]

am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '0ab0d875d46d6d8974c9cf3ea5856dcfb557e9a4':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:35:09 +0000 (20:35 +0000)]

am ffbf2447: (-s ours) am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit 'ffbf24476c153bbd9293261cc14d9648f72b7369':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:35:02 +0000 (20:35 +0000)]

am d056218b: am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'd056218b0486676f8e3b68854f94e2d36209ea18':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:32:55 +0000 (20:32 +0000)]

am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '704954c96a797e45d421b8d910ca2426d19f6b37':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:30:57 +0000 (20:30 +0000)]

am 661e158b: (-s ours) am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '661e158b0a754f1123485673ac050e388e8056a2':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:30:53 +0000 (20:30 +0000)]

am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '28f550f010045d5df9e7762a567fb0351499b846':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:30:50 +0000 (20:30 +0000)]

am 083af20d: am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '083af20d9dc0d14eadd2ba03951579f88cd1f671':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:29:01 +0000 (20:29 +0000)]

am 8f6a9a65: am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '8f6a9a658a8a06eb4f11cfff5dca7edf3c7462ad':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:28:48 +0000 (20:28 +0000)]

am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '5f56ea8d802b3a7ce5ba8992a84dd3b462676e0e':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Ricardo Cervera [Tue, 3 Jun 2014 20:27:41 +0000 (13:27 -0700)]

docs: Added release notes for SDK Tools 22.6.4

Change-Id: Iff4d980d0159b6773f6d6c60ed5d413d4e698083

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:27:08 +0000 (20:27 +0000)]

am 2ac96a09: am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '2ac96a093b12883c44327edba899e6c79ee71a7b':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:25:51 +0000 (20:25 +0000)]

am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '03a832669ded18a99d4ac37f047a82d2b198302a':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:25:48 +0000 (20:25 +0000)]

am 531bdb5b: am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit '531bdb5b57a7a903cea16baedb914e34df941651':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:24:25 +0000 (20:24 +0000)]

am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'f48ab8feec71419e574a2d2f08a29be87743ef07':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:23:30 +0000 (20:23 +0000)]

am 8974a5e6: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '8974a5e6d8408b4cd93f1befb05cc9b654b71e4a':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:21:20 +0000 (20:21 +0000)]

am a0fc1f46: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'a0fc1f46264e316449402525fbeb033138ec5f49':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:21:12 +0000 (20:21 +0000)]

am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '08d2007b33838570a96c8df890f0757fa920904c':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:21:10 +0000 (20:21 +0000)]

am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit '3b7c09b4336f421c489523c10278ecfbfb0708a7':
LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 3 Jun 2014 20:21:08 +0000 (20:21 +0000)]

am fe6f3049: Remove @NonNull attribute [DO NOT MERGE]

* commit 'fe6f30491f8506a4b2ad895a0f3e68de180e4243':
Remove @NonNull attribute [DO NOT MERGE]

commit | commitdiff | tree

Andrew Solovay [Tue, 3 Jun 2014 17:42:05 +0000 (17:42 +0000)]

am 9dc2412d: am 47ede834: docs: Fixed alphabetization on Play Store icons page.

* commit '9dc2412dfcaa4d5c77ea892c3c1d3d6ea59597dd':
docs: Fixed alphabetization on Play Store icons page.

commit | commitdiff | tree

Andrew Solovay [Tue, 3 Jun 2014 17:38:04 +0000 (17:38 +0000)]

am 47ede834: docs: Fixed alphabetization on Play Store icons page.

* commit '47ede8340b8bd4e5e5c500ddf84b3510dd12c1a0':
docs: Fixed alphabetization on Play Store icons page.

commit | commitdiff | tree

Craig Mautner [Sat, 31 May 2014 22:13:37 +0000 (15:13 -0700)]

Force all windows to redraw before unblanking screen

The screen turning on would show windows as they were when the screen
turned off. This fix forces all showing windows to redraw first and
only then allow the screen to turn on.

Fixes bug 15092354.

Change-Id: I349995bf6446d6c462dccdc2b599bab9ab0ab2c8

commit | commitdiff | tree

Michael Kolb [Mon, 2 Jun 2014 21:57:39 +0000 (21:57 +0000)]

Merge "Fix circular mask" into klp-modular-dev

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.