OSDN Git Service
Baligh Uddin [Sun, 6 Jul 2014 18:26:05 +0000 (18:26 +0000)]
am
b4600e79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
b4600e793b4b8a4332031d08c5ba5290abe0c71d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:26:01 +0000 (18:26 +0000)]
am
f599be53: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f599be53727976c495575e864e1566cfdaf2eee5':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:25:58 +0000 (18:25 +0000)]
am
f1c1e725: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f1c1e725ec44aab7ebc5c4530133b169ddb6f73e':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:22:35 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 16:44:21 +0000 (09:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I99d859070b0a2d65c9e57556f7ccc0b4dfb3a995
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:18:46 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 21:00:41 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2898d53a3f6bf4fc920fa8c3bc122d00aa879d18
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:19:04 +0000 (18:19 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 17:45:00 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I300f1b8bf139efb93c8a7c0d0f5ad8b77a4c2d42
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:22:30 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:21:51 +0000 (18:21 +0000)]
am
f67d4baf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f67d4bafee9ab60912add98ad4ec0697d3e231fc':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 16:49:29 +0000 (09:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5577bfec3d18dd6a399f8ad5e0b520e992eac1e5
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:15:54 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 21:08:04 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic36073cb71d82e8bb36b3409185a0bfc9ddb0ecd
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:02:50 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 22:09:48 +0000 (15:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic88faf73641a8570560ffe751f0c5776290c75c3
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:00:38 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Sat, 5 Jul 2014 22:40:58 +0000 (15:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7fc09c4e2f022c81a461d7228727ddc84ad6bb96
Auto-generated-cl: translation import
Baligh Uddin [Sat, 5 Jul 2014 22:25:24 +0000 (15:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1765b9912ea2356677a927edb34166ea5cab43d9
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:18:57 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 18:54:26 +0000 (11:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4679d0c0cec6404efadee93753f5877d4d0d1db6
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:18:40 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 21:03:04 +0000 (14:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I373c01ed35b98a24791ab2fdfa57e019b8e705ba
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:15:48 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:08:28 +0000 (18:08 +0000)]
am
f2e29071: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
f2e29071079ab67d6ed66852f6a6f5d4f1ee8753':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:27 +0000 (18:08 +0000)]
Merge branch 'klp-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev
Baligh Uddin [Sun, 6 Jul 2014 18:08:20 +0000 (18:08 +0000)]
am
eb17f6ab: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
eb17f6ab69ce9dda043c17827351522a8bcc2613':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 18:08:17 +0000 (18:08 +0000)]
am
77c61120: (-s ours) Import translations. DO NOT MERGE
* commit '
77c6112089e3fb58189b69f56f14b55a94c6b0da':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 21:10:06 +0000 (14:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie1868681bbc06d89a0695863e9146cd2ee85a5de
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:08:17 +0000 (18:08 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 22:18:31 +0000 (15:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic92e03292351a4163522907fd285ad41d4877039
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:02:45 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 22:12:04 +0000 (15:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I986812a228a7207cb203a4c0862d96dbd0f1e868
Auto-generated-cl: translation import
Baligh Uddin [Sun, 6 Jul 2014 18:00:33 +0000 (18:00 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Sat, 5 Jul 2014 22:42:53 +0000 (15:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia07b3b246f397eda9216449403dd283e02f69c42
Auto-generated-cl: translation import
Baligh Uddin [Sat, 5 Jul 2014 22:30:27 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1fd2ea26acb4d0e1c46c887c94d25e0ea1407e81
Auto-generated-cl: translation import
Joe Fernandez [Wed, 25 Jun 2014 22:49:36 +0000 (22:49 +0000)]
am
52e2416c: Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
* commit '
52e2416cc72f7d87e2f7f1aa29b7a9cb85ae0c70':
docs: fix wear whitelist sign up language to be less confusing
smain@google.com [Wed, 25 Jun 2014 18:14:11 +0000 (18:14 +0000)]
am
12df4f9e: update wear icons on preview page
* commit '
12df4f9ef19b49147f700cfa95fb73517540b033':
update wear icons on preview page
smain@google.com [Wed, 25 Jun 2014 18:07:05 +0000 (11:07 -0700)]
update wear icons on preview page
Change-Id: I17fc5a7d1ba637ea0eb557eae50aea76667e2430
Robert Ly [Wed, 25 Jun 2014 04:01:53 +0000 (04:01 +0000)]
am
2a139d64: Merge "docs: add gms core preview hoop-jumping" into klp-docs
* commit '
2a139d648602e6812e5366ec1abc29fa2b010c99':
docs: add gms core preview hoop-jumping
Joe Fernandez [Wed, 25 Jun 2014 22:45:23 +0000 (22:45 +0000)]
Merge "docs: fix wear whitelist sign up language to be less confusing" into klp-docs
Joe Fernandez [Wed, 25 Jun 2014 22:40:48 +0000 (15:40 -0700)]
docs: fix wear whitelist sign up language to be less confusing
Change-Id: I15fcad2db2df6f8f2717e486e306246de3f96f4b
Robert Ly [Wed, 25 Jun 2014 03:57:34 +0000 (03:57 +0000)]
Merge "docs: add gms core preview hoop-jumping" into klp-docs
smain@google.com [Wed, 25 Jun 2014 02:06:47 +0000 (02:06 +0000)]
smain@google.com [Wed, 25 Jun 2014 02:06:43 +0000 (02:06 +0000)]
smain@google.com [Tue, 24 Jun 2014 19:35:31 +0000 (12:35 -0700)]
DO NOT MERGE!
add image to GP education collection card
Change-Id: Ie21813f84277ee8f882efc1a8589080476a4bf66
(cherry picked from commit
f4787f4dce96bef3de95d36ce400691c72df3d7e)
smain@google.com [Wed, 18 Jun 2014 23:13:56 +0000 (16:13 -0700)]
DO NOT MERGE!
update Edu pages for launch of Chrome edu apps on play store
removes the FAQ and Guidelines docs, redirect to devsite copy will
be implemented with separate CL
Change-Id: I006d2374b1d49fbf41ce60a39f08fe1ad96096c1
(cherry picked from commit
941f800a848a5dad4d4541a214477e95f738a5c8)
Robert Ly [Wed, 25 Jun 2014 01:10:33 +0000 (18:10 -0700)]
docs: add gms core preview hoop-jumping
Change-Id: Ic9602c0f3a309bd37dc5f628f4316b0124f0c8b3
Scott Main [Wed, 25 Jun 2014 01:02:00 +0000 (01:02 +0000)]
am
4aa9c6d5: DO NOT MERGE Revert "Revert "add \'coming soon\' page for google io announcements""
* commit '
4aa9c6d5d38a1091bda7950baba5a9199898a728':
DO NOT MERGE Revert "Revert "add 'coming soon' page for google io announcements""
Scott Main [Wed, 25 Jun 2014 01:01:57 +0000 (01:01 +0000)]
am
87670bcb: Revert "add \'coming soon\' page for google io announcements"
* commit '
87670bcb34c308731bbec177dae99cd9981656fb':
Revert "add 'coming soon' page for google io announcements"
smain@google.com [Wed, 25 Jun 2014 01:01:54 +0000 (01:01 +0000)]
am
cca2a91a: add \'coming soon\' page for google io announcements
* commit '
cca2a91a7cba2f0005b9d4a9a21a506ed191c348':
add 'coming soon' page for google io announcements
Scott Main [Wed, 25 Jun 2014 00:58:45 +0000 (00:58 +0000)]
DO NOT MERGE
Revert "Revert "add 'coming soon' page for google io announcements""
This reverts commit
87670bcb34c308731bbec177dae99cd9981656fb.
Change-Id: Ica55fdc9f345c55ab038ecbf836673be4f4bb1a0
Scott Main [Wed, 25 Jun 2014 00:57:48 +0000 (00:57 +0000)]
Revert "add 'coming soon' page for google io announcements"
This reverts commit
cca2a91a7cba2f0005b9d4a9a21a506ed191c348.
Change-Id: I0212a0f0dbe63c14d796c9e764c0871790fddc46
smain@google.com [Wed, 25 Jun 2014 00:47:30 +0000 (17:47 -0700)]
add 'coming soon' page for google io announcements
Change-Id: I17e09aaa3c93060b306301ffa5012d8fcee3af22
Andrew Solovay [Tue, 24 Jun 2014 21:39:27 +0000 (21:39 +0000)]
am
906eda45: Merge "docs: Fixed instructions on checking VM version." into klp-docs
* commit '
906eda45b27668e4c0a37b5ba3fbd530308883e6':
docs: Fixed instructions on checking VM version.
Andrew Solovay [Tue, 24 Jun 2014 21:35:31 +0000 (21:35 +0000)]
Merge "docs: Fixed instructions on checking VM version." into klp-docs
Andrew Solovay [Tue, 24 Jun 2014 20:04:54 +0000 (13:04 -0700)]
docs: Fixed instructions on checking VM version.
Per IRogers@ , you check the VM version by calling
System.getProperty("java.vm.version") -- not, as previously
documented, "dalvik.vm.version" (Ian says there's no such property as
dalvik.vm.version.) BDC@ and/or AnwarG@, can you confirm?
Revised doc is staged to:
http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html#GC_Migration
bug:
15836664
Change-Id: Ie5e2e058fa9ce033afd18a0f4079faa81bbf317e
Dirk Dougherty [Sat, 21 Jun 2014 02:33:40 +0000 (02:33 +0000)]
am
bf66c17e: Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs
* commit '
bf66c17e4ad64c8420d3d3b5e8d789af00479eab':
remove extraneous tag causing extra spacing between heading/text.
Joe Fernandez [Fri, 20 Jun 2014 21:41:30 +0000 (21:41 +0000)]
am
2d7b3ded: Merge "ExoPlayer developer guide" into klp-docs
* commit '
2d7b3dedd0ddccd5a44b7c289f5075ea1696c06c':
ExoPlayer developer guide
Dirk Dougherty [Sat, 21 Jun 2014 02:29:54 +0000 (02:29 +0000)]
Merge "remove extraneous tag causing extra spacing between heading/text." into klp-docs
Joe Fernandez [Fri, 20 Jun 2014 21:36:25 +0000 (21:36 +0000)]
Merge "ExoPlayer developer guide" into klp-docs
Joe Fernandez [Wed, 11 Jun 2014 06:45:58 +0000 (23:45 -0700)]
ExoPlayer developer guide
Change-Id: Icacaa0e68e602fc77946e10729b3649baaf4331b
Deepanshu Gupta [Wed, 18 Jun 2014 00:10:34 +0000 (00:10 +0000)]
am
c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE]
* commit '
c57b410c8ef41e269f82f3b42a8d22a15c08755b':
Add a script to rename fonts for SDK. [DO NOT MERGE]
Andrew Solovay [Fri, 13 Jun 2014 18:23:03 +0000 (18:23 +0000)]
am
4737af8b: docs: Added "Verifying for ART" to TOC.
* commit '
4737af8b0aa77681270b6bc6478a946b71144e45':
docs: Added "Verifying for ART" to TOC.
Andrew Solovay [Thu, 12 Jun 2014 17:40:23 +0000 (10:40 -0700)]
docs: Added "Verifying for ART" to TOC.
Now that "Verifying App Behavior on the Android Runtime (ART)"
(guide/practices/verifying-apps-art.jd) is published, also adding it
to the "API Guides" TOC.
You can verify it at
http://asolovay.mtv:9001/guide/practices/index.html
(...it's the last element in the "Best Practices" submenu.)
Change-Id: If7b445616768d17193309dbd3075b2630652ac96
Deepanshu Gupta [Fri, 16 May 2014 01:39:30 +0000 (18:39 -0700)]
Add a script to rename fonts for SDK. [DO NOT MERGE]
Create a script that will rename the PS name encoded in the font that is
to be shipped with the SDK.
This commit is a combination of 5 commits:
e0660d31c256e02e5f5e2967508a7205d1f62f86
7e149f02c4e4403101e7e0e88af36cd4ab6f3554
66d3314301a8983c7070a15ea68daacc7300b7f2
c6364fd90de1600526d3431ce0740b6b856e48f0
2d8c52dc4502b8407705d5b6efe628cb657b20b4
Change-Id: I675a98db39fea4525e3673656af1764eb7e5bb96
Andrew Solovay [Thu, 12 Jun 2014 17:19:33 +0000 (17:19 +0000)]
am
ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
* commit '
ded9c171ead51b358538a65d8b84946e05d8db2b':
docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
Dirk Dougherty [Thu, 12 Jun 2014 04:03:33 +0000 (21:03 -0700)]
remove extraneous tag causing extra spacing between heading/text.
Change-Id: I008f48f8274ed45d38dcef05fa9c47b935f23910
Dirk Dougherty [Thu, 12 Jun 2014 02:37:27 +0000 (02:37 +0000)]
am
bdcd6fc7: Doc change: Update monetization docs.
* commit '
bdcd6fc777e678fb3d0d9b7f000b43d703fea9cd':
Doc change: Update monetization docs.
Dirk Dougherty [Tue, 10 Jun 2014 21:35:17 +0000 (14:35 -0700)]
Doc change: Update monetization docs.
Change-Id: Ic34c1a08f8b7bcd271ad53f31c62d0bab82fc053
Andrew Solovay [Thu, 12 Jun 2014 17:16:37 +0000 (17:16 +0000)]
Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs
Robert Ly [Tue, 10 Jun 2014 02:44:08 +0000 (02:44 +0000)]
am
80e84e2d: am
f3cecfa2: am
55d525b2: am
716cc7dc: Add documentation for AndroidKeyStore
* commit '
80e84e2db92ba190c6c517dd4c71cd12c0adb249':
Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:39:28 +0000 (02:39 +0000)]
am
f3cecfa2: am
55d525b2: am
716cc7dc: Add documentation for AndroidKeyStore
* commit '
f3cecfa2185ef5622992b21da8204b8b6590ef2d':
Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:36:10 +0000 (02:36 +0000)]
am
55d525b2: am
716cc7dc: Add documentation for AndroidKeyStore
* commit '
55d525b26b716351625798675afe69c6cf43cf5a':
Add documentation for AndroidKeyStore
Robert Ly [Tue, 10 Jun 2014 02:32:29 +0000 (02:32 +0000)]
am
716cc7dc: Add documentation for AndroidKeyStore
* commit '
716cc7dcac1bb9279326ab92a78a246b3a70de4e':
Add documentation for AndroidKeyStore
Amit Mahajan [Mon, 9 Jun 2014 19:46:01 +0000 (19:46 +0000)]
am
20c5ce50: Handle provisioning APN by turning off/on radio.
* commit '
20c5ce50c456742bf912ebb915be45bfdb51487d':
Handle provisioning APN by turning off/on radio.
Amit Mahajan [Fri, 6 Jun 2014 23:53:34 +0000 (16:53 -0700)]
Handle provisioning APN by turning off/on radio.
The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).
bug:
13190133
Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81
Andrew Solovay [Tue, 20 May 2014 22:50:13 +0000 (15:50 -0700)]
docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
Contains information for developers to make sure their apps work properly
with the ART runtime.
This doc is staged to:
http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html
This is intended to be a companion to the newly-expanded "Introducing ART"
doc on source.android.com (http://ag/469776), which has general information
about ART's new features.
Change-Id: I77c6e552cfedb13dee1d256fec15926fffcbbbb3
Robert Ly [Sun, 8 Jun 2014 08:35:23 +0000 (08:35 +0000)]
am
e115755d: Merge "remove erroneous file" into klp-docs
* commit '
e115755d0fbd067a1996eb448cda58a14cce22d1':
remove erroneous file
Robert Ly [Sun, 8 Jun 2014 05:39:55 +0000 (05:39 +0000)]
Merge "remove erroneous file" into klp-docs
Robert Ly [Sun, 8 Jun 2014 05:38:18 +0000 (22:38 -0700)]
remove erroneous file
Change-Id: Idb46777d80ee1b6286769fdceba7639877ab2388
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.
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
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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
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]
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
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]
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]
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]