OSDN Git Service
Geoff Mendal [Mon, 13 Jul 2015 15:11:20 +0000 (15:11 +0000)]
am
a8bbc7ac: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a8bbc7ac9afb140c1e07db96cd642f41be18086f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:11:17 +0000 (15:11 +0000)]
am
ec10f595: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
ec10f5959cebff246834a8ba719b96a75b2a8d5c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:11:13 +0000 (15:11 +0000)]
am
cc9b8ddd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
cc9b8ddde7c0d0eb30b326d50c08bb330029545c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:11:09 +0000 (15:11 +0000)]
am
4d64bdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
4d64bdbc28a8d9d13eb6291119a20ca9784692e4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:11:05 +0000 (15:11 +0000)]
am
f841432e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
f841432ec61400f0c53c1720809b4e4f1bb9d917':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:11:01 +0000 (15:11 +0000)]
am
1fc614f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
1fc614f862d8a16d80830e531f19f61fb8327887':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:10:58 +0000 (15:10 +0000)]
am
4dbca7f6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
4dbca7f6ca9ed0911dd28c43869c0d8d6b39db77':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:10:17 +0000 (15:10 +0000)]
am
d7805ef7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
d7805ef7364b28e6c90140260d5065962c2a40da':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:10:14 +0000 (15:10 +0000)]
am
7ff74826: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
7ff74826043260fb15c7d7347000929694619247':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:09:51 +0000 (15:09 +0000)]
am
388d1cc8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
388d1cc8756d0d3c317b1cc71475f457284725fe':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:09:24 +0000 (15:09 +0000)]
am
efa098a7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
efa098a763969cb96e09e12331bf43d5991b8d93':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:09:20 +0000 (15:09 +0000)]
am
bc69f1c9: (-s ours) Import translations. DO NOT MERGE
* commit '
bc69f1c95215d3c8f93e184f433460379bc326e0':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 11 Jul 2015 22:17:01 +0000 (22:17 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 22:16:49 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 22:16:34 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 22:16:19 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 22:03:45 +0000 (22:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 22:03:31 +0000 (22:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 22:03:12 +0000 (22:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 20:54:43 +0000 (13:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f34197d5bad1ec32f924cfdb0190a1bc6657579
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 20:47:51 +0000 (13:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6a357f6c884a6df2374b5d9607547b1d825b1454
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 20:42:43 +0000 (13:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib08162355c40eba8e5eb2c80b8da45cb228486aa
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 20:39:58 +0000 (13:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia6c22efa7d0a9bb73d3d60063228927274209e18
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 20:37:08 +0000 (13:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie294e23803870c2283b2002f260dc466294e4161
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 20:32:02 +0000 (13:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I44c6ca4646a822b04b8b047e83622b7de1d36b15
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 20:29:08 +0000 (13:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id179810f3a68b943f0f39ba81c639f422e7574a3
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 19:03:35 +0000 (19:03 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 18:57:25 +0000 (18:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 18:18:19 +0000 (13:18 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ia540bc3e4e16261deea98891e52466905bd17d1f
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 18:12:45 +0000 (13:12 -0500)]
Import translations. DO NOT MERGE
Change-Id: Idc7b4739005f2d06bf0dd38bfdb18f5c205dc5eb
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 17:07:19 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 17:06:50 +0000 (12:06 -0500)]
Import translations. DO NOT MERGE
Change-Id: If92ad99cfc2fab1a96e9bd99d7bbac850cba9bf5
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 16:57:19 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Sat, 11 Jul 2015 16:54:16 +0000 (11:54 -0500)]
Import translations. DO NOT MERGE
Change-Id: I787a0e53f646c1b015882b689785f24b641e4eba
Auto-generated-cl: translation import
Geoff Mendal [Sat, 11 Jul 2015 16:51:36 +0000 (11:51 -0500)]
Import translations. DO NOT MERGE
Change-Id: I7201c2b8f3e2e5319ed1ca4fd25f6d8987547913
Auto-generated-cl: translation import
David Friedman [Fri, 10 Jul 2015 20:42:43 +0000 (20:42 +0000)]
am
888436f5: am
c1541571: am
1c231da0: am
48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '
888436f5eec553621904874309d1ae7e76dd739a':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
David Friedman [Fri, 10 Jul 2015 20:28:22 +0000 (20:28 +0000)]
am
c1541571: am
1c231da0: am
48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '
c1541571ff501ba7f58ab9f066828e6620aaa90c':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
David Friedman [Fri, 10 Jul 2015 20:11:46 +0000 (20:11 +0000)]
am
1c231da0: am
48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '
1c231da06c9e9f82c52d36211a865703a5d0cd62':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
David Friedman [Fri, 10 Jul 2015 19:55:22 +0000 (19:55 +0000)]
am
48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
* commit '
48143e6ab960860a87171563d8a7535b41762ffa':
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
David Friedman [Fri, 10 Jul 2015 18:41:02 +0000 (11:41 -0700)]
Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page
Fixes broken anchors in yellow banner on English version. Adds the banner
to non-English version pages. Adjusted wording for a Known Issue on the
"Support and Release Notes" page.
Change-Id: Ia1db8db34cec854bcc4ad7daa1ad44fa23fc878e
Robin Lee [Fri, 10 Jul 2015 19:32:40 +0000 (19:32 +0000)]
am
2164cf4f: am
f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
* commit '
2164cf4f4043b4892db5688ed53624af758fcdaa':
Legacy VPN calls to require a userID
Robin Lee [Fri, 10 Jul 2015 19:21:44 +0000 (19:21 +0000)]
am
f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev
* commit '
f180fe31de4cc428c298a2faed394c417ade5483':
Legacy VPN calls to require a userID
Robin Lee [Fri, 10 Jul 2015 19:05:36 +0000 (19:05 +0000)]
Merge "Legacy VPN calls to require a userID" into mnc-dev
Raph Levien [Fri, 10 Jul 2015 19:04:51 +0000 (19:04 +0000)]
am
9320bb08: am
5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
* commit '
9320bb082f53dfdf34881907a736527b3bdd9b45':
Fix StaticLayout crash when maxLines = 0
Robert Greenwalt [Fri, 10 Jul 2015 18:52:25 +0000 (18:52 +0000)]
am
66f59dc1: am
1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
* commit '
66f59dc1bde15be207d49fafb97db372cb01d977':
Enable EMERGENCY mobile connections.
Robert Greenwalt [Fri, 10 Jul 2015 18:52:20 +0000 (18:52 +0000)]
am
d30a3d66: am
1ebcb6f8: Merge "Fix permissions." into mnc-dev
* commit '
d30a3d6693da16cf2daef05847ddaa4ae7453e83':
Fix permissions.
Raph Levien [Fri, 10 Jul 2015 18:48:36 +0000 (18:48 +0000)]
am
5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
* commit '
5d1654a9439f0ed81ecccecfacda34872270dfcb':
Fix StaticLayout crash when maxLines = 0
Robert Greenwalt [Fri, 10 Jul 2015 18:38:22 +0000 (18:38 +0000)]
am
1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev
* commit '
1570b6b3c7d1d41a52555312d161d0afe4b81df3':
Enable EMERGENCY mobile connections.
Robert Greenwalt [Fri, 10 Jul 2015 18:38:15 +0000 (18:38 +0000)]
am
1ebcb6f8: Merge "Fix permissions." into mnc-dev
* commit '
1ebcb6f8b2f989c84311555f4961506dba959d37':
Fix permissions.
Raph Levien [Fri, 10 Jul 2015 18:37:43 +0000 (18:37 +0000)]
Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev
Robert Greenwalt [Fri, 10 Jul 2015 18:23:12 +0000 (18:23 +0000)]
Merge "Enable EMERGENCY mobile connections." into mnc-dev
Robert Greenwalt [Fri, 10 Jul 2015 18:21:45 +0000 (18:21 +0000)]
Merge "Fix permissions." into mnc-dev
Chris Banes [Fri, 10 Jul 2015 18:14:25 +0000 (18:14 +0000)]
am
ead0cea0: am
77cae786: am
98b1f102: am
c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit '
ead0cea0f57565aeb6ddc3a78ec1da3314d264a8':
Support Library v22.2.0 API diff
John Reck [Fri, 10 Jul 2015 18:14:19 +0000 (18:14 +0000)]
am
d1b16386: am
2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit '
d1b16386e7a2c793bb0fc3d19708f1c2853e92da':
Improve ImageView drawable re-use
John Reck [Fri, 10 Jul 2015 18:14:15 +0000 (18:14 +0000)]
am
b25c0bb7: am
525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev
* commit '
b25c0bb7ad06c7339555b54e17e183e04ed40d13':
Create a thread_local cache for textLocale
David Friedman [Fri, 10 Jul 2015 18:14:10 +0000 (18:14 +0000)]
am
d38de2a1: am
a2c2cc42: am
3f831568: am
6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit '
d38de2a14d59d99eba9e2611132ff50a0e825ae2':
Docs: Revisions to top DAC landing page and several Preview-page revisions.
Chris Banes [Fri, 10 Jul 2015 18:00:58 +0000 (18:00 +0000)]
am
77cae786: am
98b1f102: am
c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit '
77cae7869dba770f9ec8054b312a29dea8f317f4':
Support Library v22.2.0 API diff
John Reck [Fri, 10 Jul 2015 18:00:55 +0000 (18:00 +0000)]
am
2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev
* commit '
2c7ed6e80a7e9504a0c0e13a27e54332c603d1cc':
Improve ImageView drawable re-use
John Reck [Fri, 10 Jul 2015 18:00:50 +0000 (18:00 +0000)]
am
525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev
* commit '
525ac80d2dda4ce7a902b67d082ed26d0986f525':
Create a thread_local cache for textLocale
David Friedman [Fri, 10 Jul 2015 18:00:46 +0000 (18:00 +0000)]
am
a2c2cc42: am
3f831568: am
6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit '
a2c2cc422c47a62b5494c9090b644a8fae8a9037':
Docs: Revisions to top DAC landing page and several Preview-page revisions.
Chris Banes [Fri, 10 Jul 2015 17:54:40 +0000 (17:54 +0000)]
am
98b1f102: am
c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit '
98b1f1025c606f955ab9afc3872a435a770e3813':
Support Library v22.2.0 API diff
John Reck [Fri, 10 Jul 2015 17:50:27 +0000 (17:50 +0000)]
Merge "Improve ImageView drawable re-use" into mnc-dev
John Reck [Fri, 10 Jul 2015 17:50:10 +0000 (17:50 +0000)]
Merge "Create a thread_local cache for textLocale" into mnc-dev
David Friedman [Fri, 10 Jul 2015 17:43:32 +0000 (17:43 +0000)]
am
3f831568: am
6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit '
3f83156867fba70db9f2a03f2f0192d8f3b4688e':
Docs: Revisions to top DAC landing page and several Preview-page revisions.
Chris Banes [Fri, 10 Jul 2015 17:39:34 +0000 (17:39 +0000)]
am
c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
* commit '
c2b0d1d42cf6ba2e77fdf31982b3436eeb95b89c':
Support Library v22.2.0 API diff
Roshan Pius [Fri, 10 Jul 2015 17:22:05 +0000 (17:22 +0000)]
am
0eb4da60: am
1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-dev
* commit '
0eb4da607118e28d56d18ff1bd1f060b0431c61c':
Correct the comparison done in removeAdapter.
Paul Jensen [Fri, 10 Jul 2015 17:10:40 +0000 (17:10 +0000)]
am
0bac7fa7: am
3b9ce37b: Fix build break.
* commit '
0bac7fa791ced8e1e1ab67eca72c48be1b19eded':
Fix build break.
Roshan Pius [Fri, 10 Jul 2015 17:10:30 +0000 (17:10 +0000)]
am
1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-dev
* commit '
1cb0de17a9a4de137247f7bf69ec44a83e30efa2':
Correct the comparison done in removeAdapter.
Filip Gruszczynski [Fri, 10 Jul 2015 17:09:57 +0000 (17:09 +0000)]
am
c3d69a79: (-s ours) DO NOT MERGE - Fix NPE when requesting outsets for detached view.
* commit '
c3d69a798ee7093c87e929735d43cd27a8b0b131':
DO NOT MERGE - Fix NPE when requesting outsets for detached view.
John Reck [Fri, 10 Jul 2015 16:56:34 +0000 (09:56 -0700)]
Create a thread_local cache for textLocale
Bug:
22378829
toLanguageTag is significantly more expensive than previously
thought (note ULOC_FULLNAME_CAPACITY is 157) and weighs
in at around 40us. Given that this is called on every Paint
and that there are typically thousands of Paint objects
created this adds up very quickly.
Given that the locale is almost always Locale.getDefault(),
a very simple thread_local cache of size 1 fixes this trivially
Change-Id: I819e60cac7a4b27e9dd5538332c22ce5bbd0851c
John Reck [Fri, 10 Jul 2015 17:02:58 +0000 (10:02 -0700)]
Improve ImageView drawable re-use
Bug
22403868
Initial attempt only helped if setImageBitmap() was the only
thing called but during new-loading content it's common for a
placeholder to be set via setImageDrawable.
Tweak ImageView slightly to just have a BitmapDrawable that it
lazy-creates but will hold on to for any subsequent calls
to setImageBitmap
Change-Id: I7380521c7b363d458e4cda041f1f8b2b1fb3a93a
Roshan Pius [Fri, 10 Jul 2015 16:54:42 +0000 (16:54 +0000)]
Merge "Correct the comparison done in removeAdapter." into mnc-dev
Paul Jensen [Fri, 10 Jul 2015 16:51:41 +0000 (16:51 +0000)]
am
3b9ce37b: Fix build break.
* commit '
3b9ce37b51dcc7729489701d4e797fe91f2ef559':
Fix build break.
Robert Greenwalt [Fri, 10 Jul 2015 16:08:13 +0000 (09:08 -0700)]
Fix permissions.
Legacy API should not need new permissions.
Also found some more hidden/system that should have permissions.
bug:
22379438
bug:
19257083
Change-Id: I24be0a90dffcffe03d25982a9b02eedcf03fbd59
Paul Jensen [Fri, 10 Jul 2015 16:19:38 +0000 (12:19 -0400)]
Fix build break.
Automatic merge commit caused breakage due to someone else's
intervening change adding a call site of a function whose last
parameter I removed. Function in question is
ConnectivityService.rematchAllNetworksAndRequests.
Changes that merged badly are
85cf78e and
8d48252.
Change-Id: I8fd32e1a187236a65c1b7c0ecdf17b817d108fd0
Paul Jensen [Fri, 10 Jul 2015 16:20:30 +0000 (16:20 +0000)]
am
7f9e3274: am
bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev
* commit '
7f9e3274c411924b059b3e8b04e5794362badc74':
Fallback to Cellular if WiFi fails to validate
Paul Jensen [Fri, 10 Jul 2015 16:20:26 +0000 (16:20 +0000)]
am
b54ec1bd: am
d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev
* commit '
b54ec1bd527882c5046ed4710fb8f1f9e1b90105':
Prepare some ConnectivityService logic for fallback to Cellular change
Paul Jensen [Fri, 10 Jul 2015 16:07:57 +0000 (16:07 +0000)]
am
bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev
* commit '
bbce221eecdf54317dd0655e5f3507b82db4bfc1':
Fallback to Cellular if WiFi fails to validate
Paul Jensen [Fri, 10 Jul 2015 16:07:53 +0000 (16:07 +0000)]
am
d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev
* commit '
d8cdba0d711f5956475b043a50a6041075157c77':
Prepare some ConnectivityService logic for fallback to Cellular change
Paul Jensen [Fri, 10 Jul 2015 15:51:35 +0000 (15:51 +0000)]
Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev
Paul Jensen [Fri, 10 Jul 2015 15:51:21 +0000 (15:51 +0000)]
Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev
Paul Jensen [Fri, 10 Jul 2015 15:19:43 +0000 (15:19 +0000)]
am
75a43340: am
00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
* commit '
75a43340b675fd13eac05965438aaac2a7164658':
Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
Paul Jensen [Fri, 10 Jul 2015 15:06:30 +0000 (15:06 +0000)]
am
00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
* commit '
00c64f7ca5b05384dc3c208eff43e0b1a037a7d0':
Add android.net.CaptivePortal class for captive-portal-handling-app callbacks
Paul Jensen [Fri, 10 Jul 2015 14:57:09 +0000 (14:57 +0000)]
Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev
Tom Hudson [Fri, 10 Jul 2015 12:58:53 +0000 (12:58 +0000)]
am
8ac76504: am
9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev
* commit '
8ac76504feb4837ea524b2e62a0bd04c1e266d9a':
New setLocalMatrix() operation for HWUI
Tom Hudson [Fri, 10 Jul 2015 12:46:24 +0000 (12:46 +0000)]
am
9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev
* commit '
9613e9b76410b15b7f2700080a17476bf9f3461c':
New setLocalMatrix() operation for HWUI
Tom Hudson [Fri, 10 Jul 2015 12:35:10 +0000 (12:35 +0000)]
Merge "New setLocalMatrix() operation for HWUI" into mnc-dev
Chris Banes [Fri, 10 Jul 2015 07:29:16 +0000 (07:29 +0000)]
Merge "Support Library v22.2.0 API diff" into mnc-preview-docs
Bart Sears [Fri, 10 Jul 2015 04:35:57 +0000 (04:35 +0000)]
Bart Sears [Fri, 10 Jul 2015 04:22:55 +0000 (04:22 +0000)]
Bart Sears [Fri, 10 Jul 2015 04:06:27 +0000 (21:06 -0700)]
Fix the build.
Correct a typo.
Change-Id: I16131cf7c0ce17fa09dedc67264e8199482cd27e
Svetoslav [Fri, 10 Jul 2015 04:03:43 +0000 (04:03 +0000)]
am
224ec55f: am
664251a2: Merge "Fix build" into mnc-dev
* commit '
224ec55f98afdf571334723285f9d51682b7f82b':
Fix build
Svetoslav [Fri, 10 Jul 2015 03:48:23 +0000 (03:48 +0000)]
am
664251a2: Merge "Fix build" into mnc-dev
* commit '
664251a2fd16e63762be2ca93f2559dc2b134726':
Fix build
David Friedman [Fri, 10 Jul 2015 03:40:47 +0000 (03:40 +0000)]
am
6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.
* commit '
6fb22b4e42c18c91238cc687f84e4fe5f2950c52':
Docs: Revisions to top DAC landing page and several Preview-page revisions.
Bart Sears [Fri, 10 Jul 2015 03:38:58 +0000 (03:38 +0000)]
am
1773f2df: am
1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev
* commit '
1773f2df50d0d36d688b9721b6c7aca4c9b3cd6e':
Revert "Security: AccountChooser shouldn't auto reveal accounts."
Eino-Ville Talvala [Fri, 10 Jul 2015 03:38:53 +0000 (03:38 +0000)]
am
3aa7069b: am
a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev
* commit '
3aa7069b60ff41b5047382d64a941a6aff23de58':
Camera2: Reorganize high-speed recording API slightly
Svetoslav [Fri, 10 Jul 2015 03:31:53 +0000 (03:31 +0000)]
Merge "Fix build" into mnc-dev
Bart Sears [Fri, 10 Jul 2015 03:25:11 +0000 (03:25 +0000)]
am
1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev
* commit '
1aa4049286e7ed1272ce84619f41c13a4d217395':
Revert "Security: AccountChooser shouldn't auto reveal accounts."
Eino-Ville Talvala [Fri, 10 Jul 2015 03:25:07 +0000 (03:25 +0000)]
am
a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev
* commit '
a2cd9c56f8648b5a4faee14d9dd0c4151730f78c':
Camera2: Reorganize high-speed recording API slightly
Svetoslav [Fri, 10 Jul 2015 03:19:41 +0000 (20:19 -0700)]
Fix build
Change-Id: I1b56c07aa5b85662f25158156d2c0eff115e9544