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

Deepanshu Gupta [Mon, 23 Feb 2015 19:15:57 +0000 (19:15 +0000)]

am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '99142d298213e93f673057c2334b04b38f7e4450':
Set forceFramework correctly for included layouts.

commit | commitdiff | tree

Deepanshu Gupta [Mon, 23 Feb 2015 19:09:14 +0000 (19:09 +0000)]

am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
Set forceFramework correctly for included layouts.

commit | commitdiff | tree

Deepanshu Gupta [Mon, 23 Feb 2015 19:03:29 +0000 (19:03 +0000)]

am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
Set forceFramework correctly for included layouts.

commit | commitdiff | tree

Deepanshu Gupta [Mon, 23 Feb 2015 18:56:27 +0000 (18:56 +0000)]

Merge "Set forceFramework correctly for included layouts." into lmp-dev

commit | commitdiff | tree

David Friedman [Mon, 23 Feb 2015 18:26:10 +0000 (18:26 +0000)]

am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '3570268bcf1e4c375d8b592714f8b7be25819873':
Fixes several typos.

commit | commitdiff | tree

David Friedman [Mon, 23 Feb 2015 18:26:06 +0000 (18:26 +0000)]

am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit 'f066c2358d48fdc2ecbc28af99bc8332a3d78ce1':
Update Google Play brand-info page. Bug: 18257984

commit | commitdiff | tree

David Friedman [Mon, 23 Feb 2015 18:20:37 +0000 (18:20 +0000)]

am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '09e9076ddfd5e9f738cd5096409ff3fb61174803':
Fixes several typos.

commit | commitdiff | tree

David Friedman [Mon, 23 Feb 2015 18:20:32 +0000 (18:20 +0000)]

am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '18c8a35fa4e775c3b515e739b0f32981395914ad':
Update Google Play brand-info page. Bug: 18257984

commit | commitdiff | tree

David Friedman [Mon, 23 Feb 2015 18:13:36 +0000 (18:13 +0000)]

am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit 'ab0f8ff740d314182ccc644f118a7f8ba6c4937e':
Fixes several typos.

commit | commitdiff | tree

David Friedman [Mon, 23 Feb 2015 18:13:32 +0000 (18:13 +0000)]

am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '8e604689c8c8f8ad073e12094991daa712cd8f38':
Update Google Play brand-info page. Bug: 18257984

commit | commitdiff | tree

David Friedman [Mon, 23 Feb 2015 18:06:47 +0000 (18:06 +0000)]

am 88e0145f: Merge "Fixes several typos." into lmp-docs

* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
Fixes several typos.

commit | commitdiff | tree

David Friedman [Mon, 23 Feb 2015 18:06:43 +0000 (18:06 +0000)]

am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

* commit '3c26756aefae228941588042d677424b54167aa7':
Update Google Play brand-info page. Bug: 18257984

commit | commitdiff | tree

David Friedman [Mon, 23 Feb 2015 18:05:35 +0000 (18:05 +0000)]

Merge "Fixes several typos." into lmp-docs

commit | commitdiff | tree

David Friedman [Mon, 23 Feb 2015 18:02:25 +0000 (18:02 +0000)]

Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs

commit | commitdiff | tree

Deepanshu Gupta [Mon, 23 Feb 2015 17:18:08 +0000 (09:18 -0800)]

Set forceFramework correctly for included layouts.

Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4

commit | commitdiff | tree

Geoff Mendal [Mon, 23 Feb 2015 16:34:41 +0000 (16:34 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 23 Feb 2015 15:47:09 +0000 (07:47 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 23 Feb 2015 14:20:06 +0000 (14:20 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 23 Feb 2015 14:18:26 +0000 (06:18 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 23 Feb 2015 14:12:16 +0000 (06:12 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Rich Slogar [Sat, 21 Feb 2015 01:09:58 +0000 (01:09 +0000)]

am aba93780: am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit 'aba93780b47472f411737744957af00ae8d12220':
docs: android plugin revisions page v2

commit | commitdiff | tree

Rich Slogar [Sat, 21 Feb 2015 01:04:52 +0000 (01:04 +0000)]

am 5b60b1a0: am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit '5b60b1a0401afb4d1addf53ca40facb5b5f6c0ee':
docs: android plugin revisions page v2

commit | commitdiff | tree

Rich Slogar [Sat, 21 Feb 2015 00:58:17 +0000 (00:58 +0000)]

am a91f6d00: am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit 'a91f6d0003d852fc744ce4ce3a14b0786ac2f26f':
docs: android plugin revisions page v2

commit | commitdiff | tree

Rich Slogar [Sat, 21 Feb 2015 00:51:05 +0000 (00:51 +0000)]

am 4a99918b: Merge "docs: android plugin revisions page v2" into lmp-docs

* commit '4a99918b40329e7d041db0de1e1863d688eb1b3b':
docs: android plugin revisions page v2

commit | commitdiff | tree

Rich Slogar [Sat, 21 Feb 2015 00:44:49 +0000 (00:44 +0000)]

Merge "docs: android plugin revisions page v2" into lmp-docs

commit | commitdiff | tree

David Friedman [Fri, 13 Feb 2015 03:43:35 +0000 (19:43 -0800)]

Update Google Play brand-info page.
Bug: 18257984

Change-Id: I8f41ace9bfef4b7fe1c7ad8b5fd4ea92f1438f4c

commit | commitdiff | tree

Luan Nguyen [Sat, 21 Feb 2015 00:00:01 +0000 (00:00 +0000)]

am 677a1754: am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit '677a175481a5d4eed73168a02406f6226f2c0c57':
docs: Fix issue with older devices section not expanding

commit | commitdiff | tree

Luan Nguyen [Fri, 20 Feb 2015 23:54:15 +0000 (23:54 +0000)]

am 969848c4: am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit '969848c4484b5430e00cac7c317cc5e35e7ec8f5':
docs: Fix issue with older devices section not expanding

commit | commitdiff | tree

Luan Nguyen [Fri, 20 Feb 2015 23:48:00 +0000 (23:48 +0000)]

am f900a1f4: am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit 'f900a1f48abde96e41f40f61d3610b6245a9f94c':
docs: Fix issue with older devices section not expanding

commit | commitdiff | tree

Luan Nguyen [Fri, 20 Feb 2015 23:40:47 +0000 (23:40 +0000)]

am 81752cf5: Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

* commit '81752cf5148b93ef84f8890cb04876344924eae8':
docs: Fix issue with older devices section not expanding

commit | commitdiff | tree

Luan Nguyen [Fri, 20 Feb 2015 23:36:16 +0000 (23:36 +0000)]

Merge "docs: Fix issue with older devices section not expanding" into lmp-docs

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 21:09:43 +0000 (13:09 -0800)]

docs: android plugin revisions page v2

Change-Id: Ifdefd66149a34590e3d195a9b290bc3be111caf2

commit | commitdiff | tree

David Friedman [Fri, 20 Feb 2015 17:40:06 +0000 (09:40 -0800)]

Fixes several typos.

Change-Id: Iea6463bb4f0e8c178d77a0e19544e7b2cbf8c3ca

commit | commitdiff | tree

Adrian Roos [Fri, 20 Feb 2015 14:32:44 +0000 (14:32 +0000)]

am 26b0d973: Merge "Fix change IME content description" into lmp-mr1-dev

* commit '26b0d973d8c2b05e6141fb4808fbb0a28cb7f713':
Fix change IME content description

commit | commitdiff | tree

Adrian Roos [Fri, 20 Feb 2015 14:28:36 +0000 (14:28 +0000)]

Merge "Fix change IME content description" into lmp-mr1-dev

commit | commitdiff | tree

kmccormick [Thu, 19 Feb 2015 22:11:29 +0000 (22:11 +0000)]

am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.

* commit 'bb1c03e9500e2a13044925c78a11d3c48a3a47ef':
Doc Update: fixed unescaped angle brackets in code snippets.

commit | commitdiff | tree

kmccormick [Thu, 19 Feb 2015 22:04:51 +0000 (22:04 +0000)]

am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.

* commit 'a4fce24d6652e3869f70ca9f549ef45661608114':
Doc Update: fixed unescaped angle brackets in code snippets.

commit | commitdiff | tree

kmccormick [Thu, 19 Feb 2015 21:58:53 +0000 (21:58 +0000)]

am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.

* commit 'e16f439310b784bf46d033634e4a9e59a6a35c98':
Doc Update: fixed unescaped angle brackets in code snippets.

commit | commitdiff | tree

kmccormick [Thu, 19 Feb 2015 21:51:30 +0000 (21:51 +0000)]

am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.

* commit '506cba8b51474e5dc5cdcf381d0a25dc118c2aca':
Doc Update: fixed unescaped angle brackets in code snippets.

commit | commitdiff | tree

kmccormick [Thu, 19 Feb 2015 20:17:18 +0000 (12:17 -0800)]

Doc Update: fixed unescaped angle brackets in code snippets.

Change-Id: Ie265dd58fb3a5fcffe955992dea7a1f9417a27d7

commit | commitdiff | tree

Rich Slogar [Thu, 19 Feb 2015 19:20:32 +0000 (19:20 +0000)]

am 7319ea27: am cc883a1f: am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs

* commit '7319ea278cf96c12b3945eee0c6387244887c32a':
docs: mipmap link updates

commit | commitdiff | tree

Rich Slogar [Thu, 19 Feb 2015 19:12:48 +0000 (19:12 +0000)]

am cc883a1f: am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs

* commit 'cc883a1ff3d46ffc3cb59915d6d292f91bd984a2':
docs: mipmap link updates

commit | commitdiff | tree

Rich Slogar [Thu, 19 Feb 2015 19:06:32 +0000 (19:06 +0000)]

am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs

* commit '1e0face2f77ddc7d9eb8fe6708386bfbfc167ec9':
docs: mipmap link updates

commit | commitdiff | tree

Rich Slogar [Thu, 19 Feb 2015 18:59:21 +0000 (18:59 +0000)]

am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs

* commit 'b87aa6cb96341ab32d21f5340f1064fcaa607920':
docs: mipmap link updates

commit | commitdiff | tree

Rich Slogar [Thu, 19 Feb 2015 18:55:25 +0000 (18:55 +0000)]

Merge "docs: mipmap link updates" into lmp-docs

commit | commitdiff | tree

Rich Slogar [Thu, 19 Feb 2015 18:48:37 +0000 (10:48 -0800)]

docs: mipmap link updates

Change-Id: I345d4dc29e094a6835e04eec237d1b8b8a540eaa

commit | commitdiff | tree

Adrian Roos [Thu, 19 Feb 2015 16:39:40 +0000 (17:39 +0100)]

Fix change IME content description

Bug: 19434845
Change-Id: I28be1d8efb61d47abdce168b07a0846056eb650d

commit | commitdiff | tree

Rich Slogar [Thu, 19 Feb 2015 17:11:58 +0000 (17:11 +0000)]

am 73cd35f2: am f213a8c9: am 14bb9188: am f4f059d4: docs: studio 1.1 downloads

* commit '73cd35f253e7c2efe8bef45d7eb7948011fdcae6':
docs: studio 1.1 downloads

commit | commitdiff | tree

Rich Slogar [Thu, 19 Feb 2015 17:05:34 +0000 (17:05 +0000)]

am f213a8c9: am 14bb9188: am f4f059d4: docs: studio 1.1 downloads

* commit 'f213a8c980109f9be940236f19a5b79b9be2b007':
docs: studio 1.1 downloads

commit | commitdiff | tree

Rich Slogar [Thu, 19 Feb 2015 16:58:49 +0000 (16:58 +0000)]

am 14bb9188: am f4f059d4: docs: studio 1.1 downloads

* commit '14bb9188bfd001bbb96749e51b8d5edc242c89e7':
docs: studio 1.1 downloads

commit | commitdiff | tree

Rich Slogar [Thu, 19 Feb 2015 16:52:35 +0000 (16:52 +0000)]

am f4f059d4: docs: studio 1.1 downloads

* commit 'f4f059d423add55516a8ea4bb1522f1329039e47':
docs: studio 1.1 downloads

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 20:14:16 +0000 (12:14 -0800)]

docs: studio 1.1 downloads

Change-Id: I663a91baba3b0a1e51aa8e3dbc991f067d0c255c

commit | commitdiff | tree

Jim Miller [Thu, 19 Feb 2015 03:17:58 +0000 (03:17 +0000)]

am 3dfd6389: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev

* commit '3dfd638921b3038c6df0e515478eb8bafccbf058':
Fix accessibility focus bug in statusbar

commit | commitdiff | tree

Jim Miller [Thu, 19 Feb 2015 03:13:37 +0000 (03:13 +0000)]

Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev

commit | commitdiff | tree

Jim Miller [Thu, 19 Feb 2015 01:55:26 +0000 (17:55 -0800)]

Fix accessibility focus bug in statusbar

The notification_stack_scroller view of the new uber statusbar should
not be focusable for accessibility

Fixes bug 19296202

Change-Id: I1b3f43ee3c480c705044cb3d565c7c7f7019bcc3

commit | commitdiff | tree

Joe Fernandez [Thu, 19 Feb 2015 00:50:18 +0000 (00:50 +0000)]

am c9b5f98b: am 6f5d4bd8: am de91b384: am e385672c: docs: remove reference to GCM doc from C2DM doc

* commit 'c9b5f98bec64e52436c128e035558744c75ee2ef':
docs: remove reference to GCM doc from C2DM doc

commit | commitdiff | tree

Joe Fernandez [Thu, 19 Feb 2015 00:42:50 +0000 (00:42 +0000)]

am 6f5d4bd8: am de91b384: am e385672c: docs: remove reference to GCM doc from C2DM doc

* commit '6f5d4bd8c3f780744f0c739cbe168f764fbf824f':
docs: remove reference to GCM doc from C2DM doc

commit | commitdiff | tree

Joe Fernandez [Thu, 19 Feb 2015 00:36:50 +0000 (00:36 +0000)]

am de91b384: am e385672c: docs: remove reference to GCM doc from C2DM doc

* commit 'de91b3842b71c5acc6ad49cc2504fc0ff0e7e3e3':
docs: remove reference to GCM doc from C2DM doc

commit | commitdiff | tree

Joe Fernandez [Thu, 19 Feb 2015 00:30:32 +0000 (00:30 +0000)]

am e385672c: docs: remove reference to GCM doc from C2DM doc

* commit 'e385672c9cb7ad212a92b77f72974035812ae9f1':
docs: remove reference to GCM doc from C2DM doc

commit | commitdiff | tree

Natalie Silvanovich [Thu, 19 Feb 2015 00:23:22 +0000 (00:23 +0000)]

am 0181b76b: am bb4d0676: am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev

* commit '0181b76b7c822c9876d5c475a2393246d85db772':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE

commit | commitdiff | tree

Joe Fernandez [Thu, 19 Feb 2015 00:16:43 +0000 (16:16 -0800)]

docs: remove reference to GCM doc from C2DM doc

Change-Id: Ic044916487d56bab22e30b24392890b97acf9d44

commit | commitdiff | tree

Natalie Silvanovich [Thu, 19 Feb 2015 00:12:49 +0000 (00:12 +0000)]

am bb4d0676: am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev

* commit 'bb4d0676fde95e68fc708d54499bb40c8fa7ccd3':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE

commit | commitdiff | tree

Natalie Silvanovich [Thu, 19 Feb 2015 00:05:53 +0000 (00:05 +0000)]

am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev

* commit '494d5b7757fab576facc5a7e923d2a15650dea1c':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE

commit | commitdiff | tree

Natalie Silvanovich [Thu, 19 Feb 2015 00:02:30 +0000 (00:02 +0000)]

Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 23:28:52 +0000 (23:28 +0000)]

am cd9c0cab: am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates

* commit 'cd9c0cab77ea635910591116e54932f727317923':
docs: lint inspection updates

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 23:21:27 +0000 (23:21 +0000)]

am 708959b5: am 755c5d88: am 56375d90: docs: lint inspection updates

* commit '708959b5326b7877553397fc17237e02f0d3adb1':
docs: lint inspection updates

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 23:14:44 +0000 (23:14 +0000)]

am 755c5d88: am 56375d90: docs: lint inspection updates

* commit '755c5d8806ac55e5a9dc9bd272408eaeb1bf1acd':
docs: lint inspection updates

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 23:07:50 +0000 (23:07 +0000)]

am 56375d90: docs: lint inspection updates

* commit '56375d90662041c3f3e98c6b77f5a3c3c506f43b':
docs: lint inspection updates

commit | commitdiff | tree

Rich Slogar [Wed, 7 Jan 2015 21:52:12 +0000 (13:52 -0800)]

docs: lint inspection updates

Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f

commit | commitdiff | tree

Geoff Mendal [Wed, 18 Feb 2015 14:00:48 +0000 (06:00 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Christopher Tate [Wed, 18 Feb 2015 02:07:55 +0000 (02:07 +0000)]

am 129ea76a: Fix wifi AP backup

* commit '129ea76a4a129fb3e8e997e8c604c0712e8a9d73':
Fix wifi AP backup

commit | commitdiff | tree

Christopher Tate [Wed, 18 Feb 2015 01:04:01 +0000 (17:04 -0800)]

Fix wifi AP backup

An OutputStream buffers only by explicit contract. OutputStreamWriter
buffers internally, always. Do not get these behaviors confused.

Bug 19341967

Change-Id: I0610ed625b0175620083dd286f3a73c24956b171

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:22:40 +0000 (00:22 +0000)]

am bd1fb402: am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge: 0f60943

* commit 'bd1fb4021f790c7f61f2bb64feef1df8f14b1b7f':
docs: note to install linux packages

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:22:35 +0000 (00:22 +0000)]

am f82c88e2: am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge: 5f31276

* commit 'f82c88e28eddd5f38b53f66b345c030063bc17fe':
docs: studio training basics create and run project updates

commit | commitdiff | tree

Andrew Solovay [Wed, 18 Feb 2015 00:22:28 +0000 (00:22 +0000)]

am 4eb14e02: am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge: 8d5ba01

* commit '4eb14e0294a675d7350cfe3da01f1c9f37fb2943':
docs: Noted that purchaseToken is long and cannot be truncated.

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:18:54 +0000 (00:18 +0000)]

am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs
automerge: 0f60943

* commit '0f609432222e9eb946bfaa2bee45301324b97311':
docs: note to install linux packages

commit | commitdiff | tree

Rich Sloager [Wed, 18 Feb 2015 00:18:01 +0000 (00:18 +0000)]

am dcf68e83: am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge: d225cfc

* commit 'dcf68e83d6868abb6334c7a1881724f04929e87c':
Revert "docs: studio proxy setup"

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:17:56 +0000 (00:17 +0000)]

am 502f303c: am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge: 797c989

* commit '502f303c6108515a86d2826d1e87d474ffdb0945':
docs: site mipmap folder updates

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:17:52 +0000 (00:17 +0000)]

am 6cdde671: am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge: c694604

* commit '6cdde6718c36851e136e7358ba2ac1fd32f6aae5':
docs: studio mipmap update

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:17:27 +0000 (00:17 +0000)]

am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs
automerge: 5f31276

* commit '5f3127620255167469fcba3d21334eb23217611d':
docs: studio training basics create and run project updates

commit | commitdiff | tree

Andrew Solovay [Wed, 18 Feb 2015 00:15:58 +0000 (00:15 +0000)]

am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs
automerge: 8d5ba01

* commit '8d5ba018266448caeb44637d273f63dbff2956af':
docs: Noted that purchaseToken is long and cannot be truncated.

commit | commitdiff | tree

Rich Sloager [Wed, 18 Feb 2015 00:14:42 +0000 (00:14 +0000)]

am d75a6833: am 099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
automerge: d225cfc

* commit 'd225cfc811fd2f4041195b6df1094e2a8a13d3be':
Revert "docs: studio proxy setup"

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:13:07 +0000 (00:13 +0000)]

am d72bea9d: am 40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
automerge: 797c989

* commit '797c989e3be0d081098866206b0e5829a7fe2ce2':
docs: site mipmap folder updates

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:11:42 +0000 (00:11 +0000)]

am 43fb9e42: am 3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
automerge: c694604

* commit 'c694604ec58fc16f2526c8689b0def0fbcfb6fc7':
docs: studio mipmap update

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:07:55 +0000 (00:07 +0000)]

am e0f61e1c: am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs

* commit 'e0f61e1c516be37125f16f1f0899ea6244d094c2':
docs: note to install linux packages

commit | commitdiff | tree

Marco Nelissen [Wed, 18 Feb 2015 00:01:02 +0000 (00:01 +0000)]

am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev

* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
Fix NPE

commit | commitdiff | tree

Rich Slogar [Wed, 18 Feb 2015 00:00:39 +0000 (00:00 +0000)]

am 717b4d13: Merge "docs: note to install linux packages" into lmp-docs

* commit '717b4d130f67606c44122c2219ed35996afc360c':
docs: note to install linux packages

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 23:54:49 +0000 (23:54 +0000)]

Merge "docs: note to install linux packages" into lmp-docs

commit | commitdiff | tree

Marco Nelissen [Tue, 17 Feb 2015 23:54:29 +0000 (23:54 +0000)]

Merge "Fix NPE" into lmp-mr1-dev

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 23:53:49 +0000 (23:53 +0000)]

am c48e9bde: am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs

* commit 'c48e9bde6f5ae924dc1f9691da086c0a9077be3a':
docs: studio training basics create and run project updates

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 23:47:29 +0000 (23:47 +0000)]

am 9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs

* commit '9911aa51255d26c4299ab612430cd400e9468bcc':
docs: studio training basics create and run project updates

commit | commitdiff | tree

Rich Slogar [Tue, 17 Feb 2015 23:40:35 +0000 (23:40 +0000)]

Merge "docs: studio training basics create and run project updates" into lmp-docs

commit | commitdiff | tree

Craig Mautner [Tue, 17 Feb 2015 23:36:51 +0000 (23:36 +0000)]

am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev

* commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9':
Do not make ActivityContainer available to apps. DO NOT MERGE

commit | commitdiff | tree

Craig Mautner [Tue, 17 Feb 2015 23:30:33 +0000 (23:30 +0000)]

Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

Andrew Solovay [Tue, 17 Feb 2015 22:56:18 +0000 (22:56 +0000)]

am d4c63b98: am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs

* commit 'd4c63b98aa25370a1ed4b57199c71413d6e24750':
docs: Noted that purchaseToken is long and cannot be truncated.

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 22:52:06 +0000 (22:52 +0000)]

am d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev

* commit 'd5471a0b2bf938cf83f4abac66a18664d8ca5277':
Revert "Fixed accessibility for the pin input view on keyguard."

commit | commitdiff | tree

Andrew Solovay [Tue, 17 Feb 2015 22:49:16 +0000 (22:49 +0000)]

am fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs

* commit 'fd454a579f5a474546db616aa014505cd50865b5':
docs: Noted that purchaseToken is long and cannot be truncated.

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 22:48:04 +0000 (22:48 +0000)]

Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev

commit | commitdiff | tree

Andrew Solovay [Tue, 17 Feb 2015 22:41:03 +0000 (22:41 +0000)]

Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs

commit | commitdiff | tree

Alan Viverette [Tue, 17 Feb 2015 22:36:06 +0000 (22:36 +0000)]

am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev

* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
Fix year picker initial range