OSDN Git Service
Ian Pedowitz [Wed, 8 Jul 2015 23:23:12 +0000 (23:23 +0000)]
am
baad8d36: am
224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev
* commit '
baad8d36a1f4e2edf9d55d55c73c4a5cdd04c0cd':
com.android.mms is no more, so removing from default_sms_application
Sasha Levitskiy [Wed, 8 Jul 2015 23:23:09 +0000 (23:23 +0000)]
am
ce3da983: am
12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev
* commit '
ce3da9839cbb905c8e6aaf38d74fc7ad719ae105':
Fingerprint: Add post enroll interface.
Jim Miller [Wed, 8 Jul 2015 23:23:05 +0000 (23:23 +0000)]
am
cd065639: am
e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev
* commit '
cd065639aebeb34219dfce1fd6ef26ba39af0fd4':
Don't use fingerId when creating names
Vineeta Srivastava [Wed, 8 Jul 2015 23:23:01 +0000 (23:23 +0000)]
am
3af271a9: am
99b8820f: Use fingerid 0 when checking failed attempts.
* commit '
3af271a957a6da325b6f33c19270df2af1f207a8':
Use fingerid 0 when checking failed attempts.
Ian Pedowitz [Wed, 8 Jul 2015 23:10:53 +0000 (23:10 +0000)]
am
224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev
* commit '
224f0369ca2ab6265379ce170c8779a7385a33f3':
com.android.mms is no more, so removing from default_sms_application
Sasha Levitskiy [Wed, 8 Jul 2015 23:10:49 +0000 (23:10 +0000)]
am
12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev
* commit '
12328ef422027f2f5f033ed65c8a09535f9ca81d':
Fingerprint: Add post enroll interface.
Jim Miller [Wed, 8 Jul 2015 23:10:42 +0000 (23:10 +0000)]
am
e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev
* commit '
e6fd76c23591c90cc8f8ae64d323e22abf491fdf':
Don't use fingerId when creating names
Vineeta Srivastava [Wed, 8 Jul 2015 23:10:38 +0000 (23:10 +0000)]
am
99b8820f: Use fingerid 0 when checking failed attempts.
* commit '
99b8820fd7357f6287e65468b23751279562807b':
Use fingerid 0 when checking failed attempts.
Ian Pedowitz [Wed, 8 Jul 2015 23:01:17 +0000 (23:01 +0000)]
Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev
Ian Pedowitz [Wed, 8 Jul 2015 02:37:22 +0000 (19:37 -0700)]
com.android.mms is no more, so removing from default_sms_application
Fixing a minor comment typo
Bug:
22333078
Change-Id: Id2df5805567967fcf5544dca0264e130b46b4858
Sasha Levitskiy [Wed, 8 Jul 2015 22:59:49 +0000 (22:59 +0000)]
Merge "Fingerprint: Add post enroll interface." into mnc-dev
Jim Miller [Wed, 8 Jul 2015 22:58:21 +0000 (22:58 +0000)]
Merge "Don't use fingerId when creating names" into mnc-dev
Sasha Levitskiy [Wed, 8 Jul 2015 20:22:20 +0000 (13:22 -0700)]
Fingerprint: Add post enroll interface.
Bug:
22007124
Change-Id: I9b74edd8e34eaf9ab559b6dc20030a95fa3ce321
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Vineeta Srivastava [Wed, 8 Jul 2015 20:37:09 +0000 (13:37 -0700)]
Use fingerid 0 when checking failed attempts.
It is valid to have finger id as Hex value which is not necessarily less than 0.
Always compare with finger id 0 to make sure we are not locking out user.
Bug:
22354158
Change-Id: I19ded12ae4ee335621fd278163c652fc154be6cf
Roshan Pius [Wed, 8 Jul 2015 22:15:25 +0000 (22:15 +0000)]
am
f08a7ada: am
8f596907: Merge "Change sequence of call removal from Phone\'s db." into mnc-dev
* commit '
f08a7ada3aaeb2cb167609f50fa77217e12243f7':
Change sequence of call removal from Phone's db.
Jorim Jaggi [Wed, 8 Jul 2015 22:15:17 +0000 (22:15 +0000)]
am
b0ca5026: am
6d712e06: Remove volume motion delay
* commit '
b0ca50264552c5451be6cf012422587ab612ecd2':
Remove volume motion delay
Jeff Sharkey [Wed, 8 Jul 2015 22:15:12 +0000 (22:15 +0000)]
am
46552cff: am
9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev
* commit '
46552cfff17d2ca57811e2216dc03a323dcded49':
Kill MediaProvider during drastic changes.
Use best volume description for MTP.
Jeff Sharkey [Wed, 8 Jul 2015 22:15:08 +0000 (22:15 +0000)]
am
612aac4e: am
c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev
* commit '
612aac4e50700ee5ab116318e0475080b2764e4d':
Generate stable MTP storage IDs.
David Friedman [Wed, 8 Jul 2015 22:15:04 +0000 (22:15 +0000)]
am
ec951af5: am
2a33526b: am
9568a412: am
3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.
* commit '
ec951af550a4fb33da63dac66dac29737e4ad490':
Docs: Adds fugu system-image links and hashes for M-Preview.
Roshan Pius [Wed, 8 Jul 2015 22:08:46 +0000 (22:08 +0000)]
am
8f596907: Merge "Change sequence of call removal from Phone\'s db." into mnc-dev
* commit '
8f596907a5241badad821a6d3490eb2cd7dd23c5':
Change sequence of call removal from Phone's db.
Jorim Jaggi [Wed, 8 Jul 2015 22:08:38 +0000 (22:08 +0000)]
am
6d712e06: Remove volume motion delay
* commit '
6d712e06f7c35d4120ce8ded5961d3bb97c44cab':
Remove volume motion delay
Roshan Pius [Wed, 8 Jul 2015 22:03:22 +0000 (22:03 +0000)]
Merge "Change sequence of call removal from Phone's db." into mnc-dev
Jeff Sharkey [Wed, 8 Jul 2015 22:01:32 +0000 (22:01 +0000)]
am
9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev
* commit '
9d587a97b9cf89f85d1782a6af66bff487568945':
Kill MediaProvider during drastic changes.
Use best volume description for MTP.
Jeff Sharkey [Wed, 8 Jul 2015 22:01:28 +0000 (22:01 +0000)]
am
c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev
* commit '
c66b90fecd06691535157e6b00088de61b51dc41':
Generate stable MTP storage IDs.
David Friedman [Wed, 8 Jul 2015 22:01:24 +0000 (22:01 +0000)]
am
2a33526b: am
9568a412: am
3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.
* commit '
2a33526b70fbf471b89451b2c2b4553efc286698':
Docs: Adds fugu system-image links and hashes for M-Preview.
Jorim Jaggi [Mon, 6 Jul 2015 23:18:11 +0000 (16:18 -0700)]
Remove volume motion delay
Disable window animations, so we can start the show animation directly.
Bug:
21335976
Change-Id: I1d25d0ce46b9a068efed0a1561051072cda226a9
Jeff Sharkey [Wed, 8 Jul 2015 21:55:52 +0000 (21:55 +0000)]
Merge changes I9971c466,Ib42474fd into mnc-dev
* changes:
Kill MediaProvider during drastic changes.
Use best volume description for MTP.
Jeff Sharkey [Wed, 8 Jul 2015 21:55:10 +0000 (21:55 +0000)]
Merge "Generate stable MTP storage IDs." into mnc-dev
Robert Greenwalt [Wed, 8 Jul 2015 21:52:58 +0000 (21:52 +0000)]
am
8e7b1954: am
8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev
* commit '
8e7b195474788c4624de7565b7c6514f8119467f':
Add/Fix Permission check on SubscriptionManager.
Roshan Pius [Wed, 8 Jul 2015 00:34:51 +0000 (17:34 -0700)]
Change sequence of call removal from Phone's db.
Since the Call API's callbacks are now fired from handlers, they end up
changing the order in which the callbacks from the Phone and Call API's
are fired. To preserve the below ordering, we move the call removal from
Phone's db to after all the onCallDestoryedcallbacks have executed.
1. Call->onStateChanged
2. Call->onDetailsChanged
3. Call->onCallDestroyed
4. Phone->onCallRemoved
BUG:
22127504
Change-Id: Ice17f727decb516baabbe69adae598ebdf370094
David Friedman [Wed, 8 Jul 2015 21:46:25 +0000 (21:46 +0000)]
am
9568a412: am
3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.
* commit '
9568a412377eb5ef247f843c1845b433eb648645':
Docs: Adds fugu system-image links and hashes for M-Preview.
Robert Greenwalt [Wed, 8 Jul 2015 21:41:06 +0000 (21:41 +0000)]
am
8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev
* commit '
8b0f3873a04103f6886fdc2fb79b9a3963567720':
Add/Fix Permission check on SubscriptionManager.
David Friedman [Wed, 8 Jul 2015 21:33:35 +0000 (21:33 +0000)]
am
3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.
* commit '
3d52c10e217c4a622b5e7c0767a46ab5d14e58ea':
Docs: Adds fugu system-image links and hashes for M-Preview.
Adrian Roos [Wed, 8 Jul 2015 21:30:04 +0000 (21:30 +0000)]
am
4a94dca1: am
7f806ec2: Merge "Dump internal state of ImageWallpaper" into mnc-dev
* commit '
4a94dca13abb7c072f57cd9b9d698f22c7f19d09':
Dump internal state of ImageWallpaper
Robert Greenwalt [Wed, 8 Jul 2015 21:26:15 +0000 (21:26 +0000)]
Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev
Adrian Roos [Wed, 8 Jul 2015 21:16:42 +0000 (21:16 +0000)]
am
7f806ec2: Merge "Dump internal state of ImageWallpaper" into mnc-dev
* commit '
7f806ec2288df739a0ec03a2363cc912ad49f443':
Dump internal state of ImageWallpaper
Jeff Sharkey [Wed, 8 Jul 2015 21:06:37 +0000 (14:06 -0700)]
Kill MediaProvider during drastic changes.
Sadly MediaProvider makes a ton of assumptions about storage paths
not changing. To ensure that it picks up radical storage changes,
kill it and let it restart to pick up new paths.
Also give ourselves a longer timeout when benchmarking.
Bug:
20275423
Change-Id: I9971c4667dabdc685cb23528443f085f152c461d
Chien-Yu Chen [Wed, 8 Jul 2015 21:01:58 +0000 (21:01 +0000)]
am
be0a7a0d: am
3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
* commit '
be0a7a0d02099af42e982f8370bc81dad612e91b':
Camera: Enforce ZERO_SHUTTER_LAG mode
Adrian Roos [Wed, 8 Jul 2015 21:01:24 +0000 (21:01 +0000)]
Merge "Dump internal state of ImageWallpaper" into mnc-dev
Chien-Yu Chen [Wed, 8 Jul 2015 20:47:16 +0000 (20:47 +0000)]
am
3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
* commit '
3bbcc46d54f667ec7529a051f1bb9cbfd9f5fed0':
Camera: Enforce ZERO_SHUTTER_LAG mode
Tingting Wang [Wed, 8 Jul 2015 20:35:01 +0000 (20:35 +0000)]
am
0f4595af: am
4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev
* commit '
0f4595afd0d9b529fa2464085f526b1d9edd73aa':
Don't display Custom for PHONE_TYPE=CUSTOM part 1.
Chien-Yu Chen [Wed, 8 Jul 2015 20:34:27 +0000 (20:34 +0000)]
Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
Tingting Wang [Wed, 8 Jul 2015 20:20:20 +0000 (20:20 +0000)]
am
4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev
* commit '
4ccf69e1191244ee104edd74843fc7ae391c5270':
Don't display Custom for PHONE_TYPE=CUSTOM part 1.
David Friedman [Wed, 8 Jul 2015 19:11:08 +0000 (12:11 -0700)]
Docs: Adds fugu system-image links and hashes for M-Preview.
This is for English and non-English pages, alike.
Change-Id: I6ad68cee7d416279a5db0a39192fdca14f1f3709
Tingting Wang [Wed, 8 Jul 2015 20:07:40 +0000 (20:07 +0000)]
Merge "Don't display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev
Tingting Wang [Tue, 7 Jul 2015 23:58:13 +0000 (16:58 -0700)]
Don't display Custom for PHONE_TYPE=CUSTOM part 1.
Dialer sometimes creates custom PHONE_TYPE values without
specifying the custom string. In this case, we shouldn't
display "Custom". We should display nothing.
BUG
21900262
Change-Id: I11aff369c76126a3f60f95aa589ae2a8a3e98bb1
Alex Klyubin [Wed, 8 Jul 2015 19:55:10 +0000 (19:55 +0000)]
am
b5501efc: am
d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev
* commit '
b5501efcddb800cdc6b41863e8c4df2c1e0012ec':
Reject AlgorithmParameters of wrong type.
Alex Klyubin [Wed, 8 Jul 2015 19:41:07 +0000 (19:41 +0000)]
am
d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev
* commit '
d25093d2fd151638a108a110484e579cc1dcaf54':
Reject AlgorithmParameters of wrong type.
Alex Klyubin [Wed, 8 Jul 2015 19:32:02 +0000 (19:32 +0000)]
Merge "Reject AlgorithmParameters of wrong type." into mnc-dev
Etan Cohen [Wed, 8 Jul 2015 19:22:05 +0000 (19:22 +0000)]
am
e35c2d2f: am
3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev
* commit '
e35c2d2fbc3f5f25db006a51a6e2bc9169389b35':
Lock screen text: consider possible WFC service in APM
Selim Cinek [Wed, 8 Jul 2015 19:21:59 +0000 (19:21 +0000)]
am
7617f55e: am
a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev
* commit '
7617f55ed14a55c2e314038373ca3f85e378c62a':
Fixed a bug where collapserunnables where dropped
Etan Cohen [Wed, 8 Jul 2015 19:10:19 +0000 (19:10 +0000)]
am
3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev
* commit '
3aa1b1e5ec3a4e2074ea054b931cd68df45b43cf':
Lock screen text: consider possible WFC service in APM
Selim Cinek [Wed, 8 Jul 2015 19:10:15 +0000 (19:10 +0000)]
am
a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev
* commit '
a8c247e0b4e14123f85cec00500144ff28aaf6ed':
Fixed a bug where collapserunnables where dropped
Etan Cohen [Wed, 8 Jul 2015 19:02:31 +0000 (19:02 +0000)]
Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev
Selim Cinek [Wed, 8 Jul 2015 18:55:32 +0000 (18:55 +0000)]
Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev
Chien-Yu Chen [Wed, 8 Jul 2015 18:55:19 +0000 (11:55 -0700)]
Camera: Enforce ZERO_SHUTTER_LAG mode
Camera devices that support YUV or PRIVATE reprocessing must list
ZERO_SHUTTER_LAG mode in android.edge.availableEdgeModes and
android.noiseReduction.availableNoiseReductionModes, and it must
be the default mode for ZSL template.
Bug:
22266686
Change-Id: I4728b2261760d11d695e9e364d8a72b3b2d31284
Etan Cohen [Mon, 6 Jul 2015 23:19:04 +0000 (16:19 -0700)]
Lock screen text: consider possible WFC service in APM
Bug:
22302226
Change-Id: Icd885b45ced2b57665fbed54ec6caac36839db6c
Jason Monk [Wed, 8 Jul 2015 17:51:27 +0000 (17:51 +0000)]
am
0caac8ea: am
fede4258: Merge "Remove bang from not connected wifi" into mnc-dev
* commit '
0caac8ea19f19d1051bb336e31d56370244f1589':
Remove bang from not connected wifi
Eric Laurent [Wed, 8 Jul 2015 17:51:23 +0000 (17:51 +0000)]
am
070df444: am
c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev
* commit '
070df444930cd9148998759bf30012937a56e564':
audio: add definitions for devices connected over IP
Geoff Mendal [Wed, 8 Jul 2015 17:39:29 +0000 (17:39 +0000)]
am
3c573bc5: (-s ours) am
4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
3c573bc5699924f5c393043847b011669b718a67':
Import translations. DO NOT MERGE
Jason Monk [Wed, 8 Jul 2015 17:38:57 +0000 (17:38 +0000)]
am
fede4258: Merge "Remove bang from not connected wifi" into mnc-dev
* commit '
fede4258fa1bf880c2b88ebea3c886003662fc74':
Remove bang from not connected wifi
Eric Laurent [Wed, 8 Jul 2015 17:38:53 +0000 (17:38 +0000)]
am
c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev
* commit '
c0344a80fdb889c2b94dcfb869edf2afc5bb60df':
audio: add definitions for devices connected over IP
Jason Monk [Wed, 8 Jul 2015 17:26:33 +0000 (17:26 +0000)]
Merge "Remove bang from not connected wifi" into mnc-dev
Eric Laurent [Wed, 8 Jul 2015 17:24:22 +0000 (17:24 +0000)]
Merge "audio: add definitions for devices connected over IP" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 17:00:13 +0000 (17:00 +0000)]
am
4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
4f5630e51d03980e80fde93154f5a0302c8179a2':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 16:45:07 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 16:38:01 +0000 (11:38 -0500)]
Import translations. DO NOT MERGE
Change-Id: I81911866f73a1274582b6c93803eebff7e0e229e
Auto-generated-cl: translation import
Jeff Sharkey [Wed, 8 Jul 2015 16:18:20 +0000 (09:18 -0700)]
Use best volume description for MTP.
Otherwise we end up showing adopted storage devices as "Unknown."
Bug:
20275423
Change-Id: Ib42474fd5b3284b1e8eca7de8a4cfbb71a34a107
Jason Monk [Wed, 8 Jul 2015 16:09:52 +0000 (12:09 -0400)]
Remove bang from not connected wifi
Bug:
22281118
Change-Id: I4752c0e7378fca4a94c73083a8a394cde7d6f170
John Reck [Wed, 8 Jul 2015 15:51:25 +0000 (15:51 +0000)]
am
dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev
* commit '
dcf8837d4902ea50f2421eecde64fe55e3d98b28':
Restrict number of hwuiTask threads
John Reck [Wed, 8 Jul 2015 15:40:42 +0000 (15:40 +0000)]
Merge "Restrict number of hwuiTask threads" into mnc-dr-dev
Chris Wren [Wed, 8 Jul 2015 15:14:57 +0000 (15:14 +0000)]
am
4c0c6739: am
32c4802a: Merge "provide a cleaner notification dump" into mnc-dev
* commit '
4c0c6739d6b22ac84f24d53250e239f5e97b5470':
provide a cleaner notification dump
Chris Wren [Wed, 8 Jul 2015 14:59:51 +0000 (14:59 +0000)]
am
32c4802a: Merge "provide a cleaner notification dump" into mnc-dev
* commit '
32c4802a8ac624e0426888612533a4d649f349b9':
provide a cleaner notification dump
Chris Wren [Wed, 8 Jul 2015 14:46:30 +0000 (14:46 +0000)]
Merge "provide a cleaner notification dump" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 14:32:50 +0000 (14:32 +0000)]
am
f63da31f: (-s ours) am
db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
f63da31f530ad43989f4269b22552df5ba3c15f7':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 14:32:47 +0000 (14:32 +0000)]
am
1e9b3cff: (-s ours) am
18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
1e9b3cffb910c63b568348aa6a21637ed208a087':
Import translations. DO NOT MERGE
Benjamin Franz [Wed, 8 Jul 2015 14:18:28 +0000 (14:18 +0000)]
am
051762f7: am
c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
* commit '
051762f77d5bf2c0dcbb05786ac5ae81086d596c':
Clarify javadoc of setPermissionPolicy
Geoff Mendal [Wed, 8 Jul 2015 14:18:24 +0000 (14:18 +0000)]
am
eaaae47d: (-s ours) am
20ad9246: (-s ours) Import translations. DO NOT MERGE
* commit '
eaaae47d8901dd59a536181e07d585fe29dc53cd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 14:18:11 +0000 (14:18 +0000)]
am
db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
db586e69afc71cbc9864849e29e77bf3b6d5ba3c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 14:18:07 +0000 (14:18 +0000)]
am
18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
18d4eaf54a60caaa2ffeae810a435bfad4abb59d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 8 Jul 2015 14:05:53 +0000 (14:05 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 14:04:00 +0000 (14:04 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Benjamin Franz [Wed, 8 Jul 2015 14:03:46 +0000 (14:03 +0000)]
am
c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
* commit '
c088e30fd403b9843a00cc311e460734bd111c26':
Clarify javadoc of setPermissionPolicy
Geoff Mendal [Wed, 8 Jul 2015 14:03:42 +0000 (14:03 +0000)]
am
20ad9246: (-s ours) Import translations. DO NOT MERGE
* commit '
20ad92460bf180abb1d2a154e8ec007ca2330e6d':
Import translations. DO NOT MERGE
Benjamin Franz [Wed, 8 Jul 2015 13:59:29 +0000 (13:59 +0000)]
Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
Geoff Mendal [Wed, 8 Jul 2015 13:54:50 +0000 (06:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5480292e44e527d094f57361680708eba4aef6d8
Auto-generated-cl: translation import
Geoff Mendal [Wed, 8 Jul 2015 13:48:51 +0000 (06:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5571e07743dcea7a5e3f064599480796132cc31c
Auto-generated-cl: translation import
Geoff Mendal [Wed, 8 Jul 2015 13:43:44 +0000 (06:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I173b85dbcf36fdc7023137949f7bb416dabc2cf5
Auto-generated-cl: translation import
Benjamin Franz [Wed, 8 Jul 2015 13:24:14 +0000 (14:24 +0100)]
Clarify javadoc of setPermissionPolicy
Bug:
22192363
Change-Id: I552eae1e84ce866d9873faacb5c261321351915a
Dirk Dougherty [Wed, 8 Jul 2015 12:12:26 +0000 (12:12 +0000)]
am
37186001: am
e3bb8e43: am
cc040d58: am
7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit '
3718600180a3496e7570e13dfae6088b89a22e81':
Doc change -- update trade practices link.
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:12:22 +0000 (12:12 +0000)]
am
706ad39b: am
a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
* commit '
706ad39b0a2b8388ab59e4c4cd86dbc65b9cc6cf':
Prevent accidental unlocking of USB data transfer.
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:58:14 +0000 (11:58 +0000)]
am
30871415: am
89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev
* commit '
30871415dca603393b05e7fa2aa9013a3360b03d':
Expose time-interval detail query on INetworkStatsSession
Dirk Dougherty [Wed, 8 Jul 2015 11:57:29 +0000 (11:57 +0000)]
am
e3bb8e43: am
cc040d58: am
7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit '
e3bb8e4306f9f55e5039315c2dddface79ba9bca':
Doc change -- update trade practices link.
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:57:25 +0000 (11:57 +0000)]
am
a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
* commit '
a2de7fc9fc0b96ba4db65ccf6c9684c8c27c2993':
Prevent accidental unlocking of USB data transfer.
Dirk Dougherty [Wed, 8 Jul 2015 11:49:01 +0000 (11:49 +0000)]
am
cc040d58: am
7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit '
cc040d583b121e6a028e2dc47691d3f4f98c6e70':
Doc change -- update trade practices link.
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:44:32 +0000 (11:44 +0000)]
Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:44:14 +0000 (11:44 +0000)]
am
89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev
* commit '
895927603606e58a46ecaee8f2244e1e2b6f2840':
Expose time-interval detail query on INetworkStatsSession
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:32:57 +0000 (11:32 +0000)]
Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev
Dirk Dougherty [Wed, 8 Jul 2015 11:29:44 +0000 (11:29 +0000)]
am
7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit '
7e8358c6e5e97dc224be65890564d44a7a043461':
Doc change -- update trade practices link.
Dirk Dougherty [Wed, 8 Jul 2015 11:20:41 +0000 (11:20 +0000)]
am
af3c755c: am
bc243440: am
590a25a3: am
70f1aadd: Doc change: add version notes for preview 2.
* commit '
af3c755c92e1bf66086f36071a8776ed32f9c391':
Doc change: add version notes for preview 2.
OSDN Git Service
