OSDN Git Service
Benjamin Franz [Fri, 1 May 2015 18:19:15 +0000 (18:19 +0000)]
am
cecb3621: am
a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev
* commit '
cecb3621d514a2fd5d5deaed05d7d39888fe5215':
Improve Accessibility behaviour in recents
Doris Liu [Fri, 1 May 2015 18:19:10 +0000 (18:19 +0000)]
am
3ebbc50c: am
27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev
* commit '
3ebbc50c3f2d3b8939e02fb22cef1dc1c2cc8a66':
Make sure transform matrix is applied when hardware layer is re-created
Benjamin Franz [Fri, 1 May 2015 18:08:01 +0000 (18:08 +0000)]
am
a7cba44a: Merge "Improve Accessibility behaviour in recents" into mnc-dev
* commit '
a7cba44a22ffdaccf5198bb83b73a31c78091978':
Improve Accessibility behaviour in recents
Doris Liu [Fri, 1 May 2015 18:07:56 +0000 (18:07 +0000)]
am
27cfed7b: Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev
* commit '
27cfed7ba56b485eb656bd7fbe6506d9d6c73e05':
Make sure transform matrix is applied when hardware layer is re-created
Benjamin Franz [Fri, 1 May 2015 17:56:16 +0000 (17:56 +0000)]
Merge "Improve Accessibility behaviour in recents" into mnc-dev
Doris Liu [Fri, 1 May 2015 17:54:43 +0000 (17:54 +0000)]
Merge "Make sure transform matrix is applied when hardware layer is re-created" into mnc-dev
Roozbeh Pournader [Fri, 1 May 2015 17:10:46 +0000 (17:10 +0000)]
am
33d1c27e: am
087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev
* commit '
33d1c27e1dc8bf0617cc333a9a33377d8793f2dd':
Rename Noto Han fonts to their latest names.
Amit Mahajan [Fri, 1 May 2015 17:10:41 +0000 (17:10 +0000)]
am
c23975da: am
13a98b6c: Support for bearer_bitmask.
* commit '
c23975da69c8006ee4d392b3539e8375b587f52b':
Support for bearer_bitmask.
Roozbeh Pournader [Fri, 1 May 2015 16:58:49 +0000 (16:58 +0000)]
am
087497d2: Merge "Rename Noto Han fonts to their latest names." into mnc-dev
* commit '
087497d256d155d432edd976d9e16671ec665462':
Rename Noto Han fonts to their latest names.
Amit Mahajan [Fri, 1 May 2015 16:58:45 +0000 (16:58 +0000)]
am
13a98b6c: Support for bearer_bitmask.
* commit '
13a98b6c6ed28bfa0cb373e49c183167699e30f0':
Support for bearer_bitmask.
Roozbeh Pournader [Fri, 1 May 2015 16:50:51 +0000 (16:50 +0000)]
Merge "Rename Noto Han fonts to their latest names." into mnc-dev
Jeff Sharkey [Fri, 1 May 2015 16:45:49 +0000 (16:45 +0000)]
am
3b342179: am
a320505f: Merge "Move both app code and data together." into mnc-dev
* commit '
3b3421796f154e846797a534cae25e97478d35bc':
Move both app code and data together.
Amit Mahajan [Thu, 26 Feb 2015 18:46:17 +0000 (10:46 -0800)]
Support for bearer_bitmask.
Change-Id: I7cae3d229445607c66b6472124264588f7571097
Jeff Sharkey [Fri, 1 May 2015 16:35:49 +0000 (16:35 +0000)]
am
a320505f: Merge "Move both app code and data together." into mnc-dev
* commit '
a320505f3a39e21f29065f0f2a01089363825318':
Move both app code and data together.
Jeff Sharkey [Fri, 1 May 2015 16:22:40 +0000 (16:22 +0000)]
Merge "Move both app code and data together." into mnc-dev
John Reck [Fri, 1 May 2015 15:00:38 +0000 (15:00 +0000)]
am
7e22cc99: am
78760b4a: Merge "A bunch more cleanups" into mnc-dev
* commit '
7e22cc9965b440a7f34b18cbbec1818f7b7ac68e':
A bunch more cleanups
John Reck [Fri, 1 May 2015 14:51:48 +0000 (14:51 +0000)]
am
78760b4a: Merge "A bunch more cleanups" into mnc-dev
* commit '
78760b4ae47f5d59a541cbcbf1fca623bae4508a':
A bunch more cleanups
John Reck [Fri, 1 May 2015 14:42:49 +0000 (14:42 +0000)]
Merge "A bunch more cleanups" into mnc-dev
Robin Lee [Fri, 1 May 2015 13:20:13 +0000 (13:20 +0000)]
am
dbb03371: am
6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-dev
* commit '
dbb03371cea085f06de3e9cfb255efaad9a97d4e':
Device policy: use owner label instead of name
Robin Lee [Fri, 1 May 2015 13:08:45 +0000 (13:08 +0000)]
am
6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-dev
* commit '
6e761c5d6b8ed2126c6544ce32db569203c46e2a':
Device policy: use owner label instead of name
Robin Lee [Fri, 1 May 2015 12:57:35 +0000 (12:57 +0000)]
Merge "Device policy: use owner label instead of name" into mnc-dev
Narayan Kamath [Fri, 1 May 2015 11:15:54 +0000 (11:15 +0000)]
am
2d7d9523: am
a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= M
* commit '
2d7d952323a11e0fcf8b2d435ba857d45af05503':
AlarmManager: Reject non-olson timezones for targetSdk >= M
Narayan Kamath [Fri, 1 May 2015 11:04:54 +0000 (11:04 +0000)]
am
a78240ba: AlarmManager: Reject non-olson timezones for targetSdk >= M
* commit '
a78240ba5f891c3fd0acb62a1b13b6dc1bbe9705':
AlarmManager: Reject non-olson timezones for targetSdk >= M
Narayan Kamath [Fri, 24 Apr 2015 12:22:03 +0000 (13:22 +0100)]
AlarmManager: Reject non-olson timezones for targetSdk >= M
This has caused a lot of grief, confusion and outright broken
behaviour due to the fact that the Posix spec and the Java spec
define conflicting interpretations of "custom" timezones like
GMT+5:30 (eastern hemisphere for java, western for posix).
bug:
19987403
bug:
19106773
Change-Id: Ia9b007067bb175b0805d4262f17390a0bd98d927
Wei Wang [Fri, 1 May 2015 08:48:14 +0000 (08:48 +0000)]
am
342c22a5: am
f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev
* commit '
342c22a5973386d5a5fdb0b552a26f51920cb026':
Fix a bug in ScanSettings constructor.
Gus Prevas [Fri, 1 May 2015 07:59:43 +0000 (07:59 +0000)]
am
25e99ce6: am
043d7a94: am
12b1b8ed: am
026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
* commit '
25e99ce6d6e3191282a08b115d4b703277d19cd1':
Fixes velocity tracking bug in SwipeDismissLayout.
Wei Wang [Fri, 1 May 2015 07:59:07 +0000 (07:59 +0000)]
am
f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev
* commit '
f2cfe6c0a9c49d4e47c269ac1ff76b757d9dd8a9':
Fix a bug in ScanSettings constructor.
Wei Wang [Fri, 1 May 2015 07:51:39 +0000 (07:51 +0000)]
Merge "Fix a bug in ScanSettings constructor." into mnc-dev
Wei Wang [Fri, 1 May 2015 07:50:32 +0000 (00:50 -0700)]
Fix a bug in ScanSettings constructor.
Change-Id: I36e6effe8063bacddd61fe2c47c0360d7ffaee71
Gus Prevas [Fri, 1 May 2015 07:49:31 +0000 (07:49 +0000)]
am
043d7a94: am
12b1b8ed: am
026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
* commit '
043d7a94ab3f3c744a5fe6a64e9f6375cd89b9cd':
Fixes velocity tracking bug in SwipeDismissLayout.
Gus Prevas [Fri, 1 May 2015 07:36:43 +0000 (07:36 +0000)]
am
12b1b8ed: am
026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
* commit '
12b1b8ed3b5bfe623cd69d3cdafd8b6b5dfe68d8':
Fixes velocity tracking bug in SwipeDismissLayout.
Wei Wang [Fri, 1 May 2015 05:30:36 +0000 (05:30 +0000)]
am
50b37f8c: am
c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev
* commit '
50b37f8c6a7237af29f533b83ee2176301d107ea':
Honor Ble scanning settings from Settings UI.
Wei Wang [Fri, 1 May 2015 05:18:17 +0000 (05:18 +0000)]
am
c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev
* commit '
c90c760431bce5ce3f7f86b0e7e5e939c2db6a38':
Honor Ble scanning settings from Settings UI.
Wei Wang [Fri, 1 May 2015 05:10:17 +0000 (05:10 +0000)]
Merge "Honor Ble scanning settings from Settings UI." into mnc-dev
Lorenzo Colitti [Fri, 1 May 2015 04:04:03 +0000 (04:04 +0000)]
am
3dc08220: am
b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* commit '
3dc082200a1f425ab579e2082c0d70eefa399b8b':
Add a hidden method to clear NetworkCapabilities.
Fix javadoc error for requestNetwork.
Simplify network callback handling code.
Document and unhide CALLBACK_PRECHECK.
Lorenzo Colitti [Fri, 1 May 2015 03:52:10 +0000 (03:52 +0000)]
am
b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* commit '
b57f236e30d87bdfa69bb99e6b3f5ec6a3cc07c7':
Add a hidden method to clear NetworkCapabilities.
Fix javadoc error for requestNetwork.
Simplify network callback handling code.
Document and unhide CALLBACK_PRECHECK.
Lorenzo Colitti [Fri, 1 May 2015 03:45:12 +0000 (03:45 +0000)]
Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* changes:
Add a hidden method to clear NetworkCapabilities.
Fix javadoc error for requestNetwork.
Simplify network callback handling code.
Document and unhide CALLBACK_PRECHECK.
Lorenzo Colitti [Mon, 27 Apr 2015 02:31:55 +0000 (11:31 +0900)]
Add a hidden method to clear NetworkCapabilities.
Change-Id: Icf7d67e24a09113340e9bff2c72526760914ef48
Lorenzo Colitti [Fri, 24 Apr 2015 08:03:31 +0000 (17:03 +0900)]
Fix javadoc error for requestNetwork.
The ConnectivityManager documentation uses {@link requestNetwork}
without specifying which version of that method it refers to.
This results in javadoc incorrectly linking to the version of the
method that takes a PendingIntent instead of the version that
takes a callback.
Change-Id: Ia914ec88005a6401b6391c5b4fc92f988baa3922
Lorenzo Colitti [Fri, 24 Apr 2015 06:21:21 +0000 (15:21 +0900)]
Simplify network callback handling code.
Change-Id: I2490ad754bf2a1282f27302c8556fb19983cc6b1
Lorenzo Colitti [Fri, 24 Apr 2015 03:23:24 +0000 (12:23 +0900)]
Document and unhide CALLBACK_PRECHECK.
Bug:
20038463
Change-Id: Ie79f2d28c06cf611289504e49c471b55ffb9890f
Robert Shih [Fri, 1 May 2015 00:57:33 +0000 (00:57 +0000)]
am
e8a8440d: am
f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev
* commit '
e8a8440d70222750ad9b8563cbc80ca5c563b9c1':
MediaPlayer: provide mime type for all track types
Miao Wang [Fri, 1 May 2015 00:57:28 +0000 (00:57 +0000)]
am
663ba954: am
bbfa9b23: Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev
* commit '
663ba95443a1ddae78b9f66a04322e98051ccf82':
[RenderScript] typo fix in BLAS, TRMM & TSMM
tturney [Fri, 1 May 2015 00:50:00 +0000 (00:50 +0000)]
am
94d7494a: am
56c58a2e: Merge "Fix typo. bug: b/
20610710" into mnc-dev
* commit '
94d7494a2b98b723710eee9d3398e99e64b7688b':
Fix typo. bug: b/
20610710
Robert Shih [Fri, 1 May 2015 00:46:54 +0000 (00:46 +0000)]
am
f1207122: Merge "MediaPlayer: provide mime type for all track types" into mnc-dev
* commit '
f12071222fcf7c762bb8d28800ae693ec58347f4':
MediaPlayer: provide mime type for all track types
Miao Wang [Fri, 1 May 2015 00:46:49 +0000 (00:46 +0000)]
am
bbfa9b23: Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev
* commit '
bbfa9b23c6b569003fc9bf0d698e8d64666f36a7':
[RenderScript] typo fix in BLAS, TRMM & TSMM
Robert Shih [Fri, 1 May 2015 00:31:22 +0000 (00:31 +0000)]
Merge "MediaPlayer: provide mime type for all track types" into mnc-dev
Lajos Molnar [Fri, 1 May 2015 00:28:36 +0000 (00:28 +0000)]
am
607dab36: am
05ebffe6: media: Hook up MediaPlayer and MediaSync to new settings
* commit '
607dab369580d8510f42b1a796ee623eaf4b2adf':
media: Hook up MediaPlayer and MediaSync to new settings
tturney [Fri, 1 May 2015 00:28:21 +0000 (00:28 +0000)]
am
56c58a2e: Merge "Fix typo. bug: b/
20610710" into mnc-dev
* commit '
56c58a2e278fb4644963dfe2a49b74471afe71c9':
Fix typo. bug: b/
20610710
Miao Wang [Fri, 1 May 2015 00:26:31 +0000 (00:26 +0000)]
Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev
tturney [Fri, 1 May 2015 00:17:40 +0000 (00:17 +0000)]
Merge "Fix typo. bug: b/
20610710" into mnc-dev
Doris Liu [Fri, 1 May 2015 00:00:35 +0000 (17:00 -0700)]
Make sure transform matrix is applied when hardware layer is re-created
Bug:
11168275
Change-Id: I9234a2efc7580d27ac8b7f0e60ceed7df23f5f25
Miao Wang [Fri, 1 May 2015 00:14:28 +0000 (17:14 -0700)]
[RenderScript] typo fix in BLAS, TRMM & TSMM
Change-Id: I78f014a864700369c7ccdfb46a257851a45abd7c
Lajos Molnar [Fri, 1 May 2015 00:07:45 +0000 (00:07 +0000)]
am
05ebffe6: media: Hook up MediaPlayer and MediaSync to new settings
* commit '
05ebffe6bf6cdacc6de4b3bbf480c31869a81661':
media: Hook up MediaPlayer and MediaSync to new settings
Lajos Molnar [Thu, 30 Apr 2015 03:41:19 +0000 (20:41 -0700)]
media: Hook up MediaPlayer and MediaSync to new settings
Bug:
19666434
Change-Id: Ib815a80a991d4be9ce179514ac517c54f98234fd
Robert Shih [Thu, 30 Apr 2015 21:36:48 +0000 (14:36 -0700)]
MediaPlayer: provide mime type for all track types
Bug:
20729923
Change-Id: Id05ca0616a72f66abe6a541417baef491c49a417
Alan Viverette [Thu, 30 Apr 2015 23:20:02 +0000 (23:20 +0000)]
am
343affaf: am
aba035d2: Merge "Fix layoutlib build breakage" into mnc-dev
* commit '
343affaf7dab7f251915aaac41472d5028e87d65':
Fix layoutlib build breakage
Alan Viverette [Thu, 30 Apr 2015 23:09:25 +0000 (23:09 +0000)]
am
aba035d2: Merge "Fix layoutlib build breakage" into mnc-dev
* commit '
aba035d2ed4a0c39d59ca039b52af2bc3f5980b4':
Fix layoutlib build breakage
Jeff Sharkey [Thu, 30 Apr 2015 23:04:50 +0000 (16:04 -0700)]
Move both app code and data together.
Refactor app movement code into the normal install flow as a new
flavor of InstallArgs. It copies both app code and data during the
copy step, and just updates paths during the rename step.
Measure free space before kicking off a move. Spawn a thread to
derive a hacky progress estimate based on free disk space counting
down.
Remove checkFreeStorage() and getLegacyNativeLibraryPath() which
nobody was calling. Fix deadlocks around package broadcasts, and fix
wrong lock ordering when loading packages.
Bug:
19993667,
20275578,
20370140
Change-Id: I7bbf14c924a724d6ebb8a41a02434750fa3302bc
Alan Viverette [Thu, 30 Apr 2015 23:00:28 +0000 (23:00 +0000)]
Merge "Fix layoutlib build breakage" into mnc-dev
Alan Viverette [Thu, 30 Apr 2015 22:57:42 +0000 (15:57 -0700)]
Fix layoutlib build breakage
Change-Id: Id3a9b79ac47ef27b04a96ff3ee50688bbb58f9c0
Andrew Lee [Thu, 30 Apr 2015 22:46:33 +0000 (22:46 +0000)]
am
972e0c7b: am
5b8b0df7: Merge "Add handler parameter for callbacks." into mnc-dev
* commit '
972e0c7b3e5ba30c844e388eb6736fb745b0e3f9':
Add handler parameter for callbacks.
Andrew Lee [Thu, 30 Apr 2015 22:34:50 +0000 (22:34 +0000)]
am
5b8b0df7: Merge "Add handler parameter for callbacks." into mnc-dev
* commit '
5b8b0df7bfcbeb8a6ac165fcbcad57aa2b597004':
Add handler parameter for callbacks.
Andrew Lee [Thu, 30 Apr 2015 22:27:21 +0000 (22:27 +0000)]
Merge "Add handler parameter for callbacks." into mnc-dev
Andrew Lee [Thu, 23 Apr 2015 22:47:06 +0000 (15:47 -0700)]
Add handler parameter for callbacks.
Bug:
20160491
Change-Id: I94639b06b8c97b6585e169d667a67ce328e716af
Rich Slogar [Thu, 30 Apr 2015 22:04:57 +0000 (22:04 +0000)]
Rich Slogar [Thu, 30 Apr 2015 22:04:53 +0000 (22:04 +0000)]
am
b4cfe2f2: am
8febd74e: am
7fbde8f5: am
408aeb05: am
b6ad1ce8: am
541dda1c: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
b4cfe2f22d3eaa200b39d965c9e760d788fd06c2':
Rich Slogar [Thu, 30 Apr 2015 22:04:48 +0000 (22:04 +0000)]
am
e0d04773: am
9c6e6050: am
ac9c751d: am
62cfe97d: am
2653774a: am
b874dc04: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
e0d04773bc984a6c2776bbf3f69efd5bb5a87567':
Rich Slogar [Thu, 30 Apr 2015 22:04:44 +0000 (22:04 +0000)]
am
18d356a7: am
50c29a3e: am
994d6ffe: am
7a258afa: am
af73c6e7: am
ff24e8e1: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
18d356a76bc2bce5760b7a335c399307a705af82':
Rich Slogar [Thu, 30 Apr 2015 21:52:46 +0000 (21:52 +0000)]
Rich Slogar [Thu, 30 Apr 2015 21:52:42 +0000 (21:52 +0000)]
am
8febd74e: am
7fbde8f5: am
408aeb05: am
b6ad1ce8: am
541dda1c: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
8febd74eaf72e84ae9bf7b93714d2a075b189adc':
Rich Slogar [Thu, 30 Apr 2015 21:52:38 +0000 (21:52 +0000)]
am
9c6e6050: am
ac9c751d: am
62cfe97d: am
2653774a: am
b874dc04: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
9c6e60500d560515256a374ce79fee4aa4648ff7':
Rich Slogar [Thu, 30 Apr 2015 21:52:33 +0000 (21:52 +0000)]
am
50c29a3e: am
994d6ffe: am
7a258afa: am
af73c6e7: am
ff24e8e1: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
50c29a3e09850cf180417671cedb7c0b1bea3633':
Rich Slogar [Thu, 30 Apr 2015 21:46:59 +0000 (21:46 +0000)]
am
d7906a1a: am
24863faa: Merge "resolved conflicts for merge of
edf44562 to mnc-dev" into mnc-dev
* commit '
d7906a1a7417f19b136e139f3d1f7198930a919a':
docs: studio 1.2 updates
Miao Wang [Thu, 30 Apr 2015 21:46:54 +0000 (21:46 +0000)]
am
c1000a39: am
8724d359: Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev
* commit '
c1000a39655246170987dced51a85e94328d035f':
[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params.
Miao Wang [Thu, 30 Apr 2015 21:46:49 +0000 (21:46 +0000)]
am
7d581218: am
01060a33: Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev
* commit '
7d5812183ac08daf844918619bcc1a5a1448aa42':
[RenderScript] fix edges cases about Transpose for SYMM & SYR2K
Wei Wang [Mon, 27 Apr 2015 00:04:29 +0000 (17:04 -0700)]
Honor Ble scanning settings from Settings UI.
Bug:
20643039
Change-Id: Ib1465108e26b8537c9da1bfbb31a99d2e33da910
Rich Slogar [Thu, 30 Apr 2015 21:37:11 +0000 (21:37 +0000)]
Rich Slogar [Thu, 30 Apr 2015 21:37:07 +0000 (21:37 +0000)]
am
7fbde8f5: am
408aeb05: am
b6ad1ce8: am
541dda1c: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
7fbde8f508cf5148f395280753c99b63cc525e45':
Rich Slogar [Thu, 30 Apr 2015 21:37:02 +0000 (21:37 +0000)]
am
ac9c751d: am
62cfe97d: am
2653774a: am
b874dc04: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
ac9c751d74135994ddaa9ccc14e87809efc08693':
Rich Slogar [Thu, 30 Apr 2015 21:36:58 +0000 (21:36 +0000)]
am
994d6ffe: am
7a258afa: am
af73c6e7: am
ff24e8e1: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
994d6ffec75b50ff199760f4c3cf464b2d0f0e83':
John Reck [Mon, 13 Apr 2015 22:20:29 +0000 (15:20 -0700)]
A bunch more cleanups
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI
Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
Rich Slogar [Thu, 30 Apr 2015 21:34:44 +0000 (21:34 +0000)]
am
24863faa: Merge "resolved conflicts for merge of
edf44562 to mnc-dev" into mnc-dev
* commit '
24863faa05dc8934f790e13f8cf153c0edb4a32a':
docs: studio 1.2 updates
Miao Wang [Thu, 30 Apr 2015 21:34:40 +0000 (21:34 +0000)]
am
8724d359: Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev
* commit '
8724d359bfe1f95fd4c558b55069e1624b461f28':
[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params.
Miao Wang [Thu, 30 Apr 2015 21:34:36 +0000 (21:34 +0000)]
am
01060a33: Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev
* commit '
01060a33a446a496cafcb06487c60df25775a1b9':
[RenderScript] fix edges cases about Transpose for SYMM & SYR2K
Rich Slogar [Thu, 30 Apr 2015 21:27:44 +0000 (21:27 +0000)]
Merge "resolved conflicts for merge of
edf44562 to mnc-dev" into mnc-dev
Miao Wang [Thu, 30 Apr 2015 21:25:18 +0000 (21:25 +0000)]
Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev
Miao Wang [Thu, 30 Apr 2015 21:25:01 +0000 (21:25 +0000)]
Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev
Alan Viverette [Thu, 30 Apr 2015 21:21:01 +0000 (21:21 +0000)]
am
87706358: am
ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
* commit '
877063589ac8b5d9e8151df9b8553ddd3adb752b':
LayoutInflater should always try to generate LayoutParams for include
Alex Klyubin [Thu, 30 Apr 2015 21:20:56 +0000 (21:20 +0000)]
am
c8b068ce: am
cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
* commit '
c8b068ce477b3520a1ab20b7f29455d630724c38':
Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
John Reck [Thu, 30 Apr 2015 21:20:51 +0000 (21:20 +0000)]
am
1d8aae3b: am
db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
* commit '
1d8aae3b1924b2340250bdffe491819a26eea5fe':
Change how Java Bitmaps are accessed in a few places
Alex Klyubin [Thu, 30 Apr 2015 21:20:47 +0000 (21:20 +0000)]
am
07a2ebd3: am
0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev
* commit '
07a2ebd39d4c77c2dbd3c6e2bddecf76894f9fba':
Fix thread affinity of FingerprintManager.
Rich Slogar [Thu, 30 Apr 2015 21:20:12 +0000 (14:20 -0700)]
resolved conflicts for merge of
edf44562 to mnc-dev
Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676
Todd Kennedy [Thu, 30 Apr 2015 21:10:06 +0000 (21:10 +0000)]
am
c7e9a17a: am
10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev
* commit '
c7e9a17a626cc07eb9e4cb4b897dad50d3fb68a8':
Remove dependency upon FragmentActivity
Alan Viverette [Thu, 30 Apr 2015 21:09:51 +0000 (21:09 +0000)]
am
ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
* commit '
ac7927a89519a79ab73723a13ed9ea12ca16056f':
LayoutInflater should always try to generate LayoutParams for include
Alex Klyubin [Thu, 30 Apr 2015 21:09:46 +0000 (21:09 +0000)]
am
cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
* commit '
cf2999aacf45506ff6f9c2876bfd4fd5a99fc394':
Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
John Reck [Thu, 30 Apr 2015 21:09:41 +0000 (21:09 +0000)]
am
db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
* commit '
db672b03a2de26127b40dbe50c794b5697b01c37':
Change how Java Bitmaps are accessed in a few places
Alex Klyubin [Thu, 30 Apr 2015 21:09:36 +0000 (21:09 +0000)]
am
0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev
* commit '
0069301d364a219bbd4b166ba6f4d9be854d556f':
Fix thread affinity of FingerprintManager.
Alan Viverette [Thu, 30 Apr 2015 21:03:22 +0000 (21:03 +0000)]
Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 21:00:59 +0000 (21:00 +0000)]
Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev