OSDN Git Service
Robert Greenwalt [Thu, 27 Aug 2015 06:43:34 +0000 (06:43 +0000)]
am
3f66835c: (-s ours) am
de335a7d: Merge "Fix Permission Typo." into mnc-dev
* commit '
3f66835cc1ac5c6888da24b305590b3f3600f117':
Mady Mellor [Thu, 27 Aug 2015 06:43:06 +0000 (06:43 +0000)]
am
809cdd57: (-s ours) am
84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev
* commit '
809cdd579abb8193f24a223de12f7b5c291fe757':
Svetoslav [Thu, 27 Aug 2015 06:42:27 +0000 (06:42 +0000)]
am
d98e6dc2: (-s ours) am
6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev
* commit '
d98e6dc2b0fd50a9522b6a538ed847c0c24aa3c7':
Svet Ganov [Thu, 27 Aug 2015 06:41:43 +0000 (06:41 +0000)]
am
11be2916: (-s ours) am
9b84b5c5: Merge "Update storage group icon" into mnc-dev
* commit '
11be291675b512aafd7f090646dbba11bdd63b27':
Jack Yu [Thu, 27 Aug 2015 06:41:05 +0000 (06:41 +0000)]
am
99b0a02f: (-s ours) am
6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev
* commit '
99b0a02f93ea3280f5b73b530f8d9c2d89973b24':
Amith Yamasani [Thu, 27 Aug 2015 06:40:17 +0000 (06:40 +0000)]
am
ac3fb15f: (-s ours) am
705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev
* commit '
ac3fb15fb8501de4ff90923bd295679e6c473fee':
Wale Ogunwale [Thu, 27 Aug 2015 06:39:29 +0000 (06:39 +0000)]
am
6a231f48: (-s ours) am
dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev
* commit '
6a231f489177ca775dd4e60eb72054812c1034f2':
Jeff Sharkey [Thu, 27 Aug 2015 06:38:38 +0000 (06:38 +0000)]
am
ddcaa330: (-s ours) am
9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev
* commit '
ddcaa330bd20ae2f566d25bd6776012a9921df6a':
Selim Cinek [Thu, 27 Aug 2015 06:37:56 +0000 (06:37 +0000)]
am
7ac64f1d: (-s ours) am
9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev
* commit '
7ac64f1d8d33ec31123fffbdb804ea406f11fd36':
Ian Pedowitz [Thu, 27 Aug 2015 06:37:11 +0000 (06:37 +0000)]
am
a1fed110: (-s ours) am
224f0369: Merge "com.android.mms is no more, so removing from default_sms_application" into mnc-dev
* commit '
a1fed110ef57dab059294ad8c45cf67420fac760':
Sasha Levitskiy [Thu, 27 Aug 2015 06:36:23 +0000 (06:36 +0000)]
am
319eacbf: (-s ours) am
12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev
* commit '
319eacbff2f0be78f3d0698cb73d05bc1e75ea23':
Jim Miller [Thu, 27 Aug 2015 06:35:21 +0000 (06:35 +0000)]
am
593fda72: (-s ours) am
e6fd76c2: Merge "Don\'t use fingerId when creating names" into mnc-dev
* commit '
593fda725aa1d7dcab22aa59eafa15d76911947c':
Vineeta Srivastava [Thu, 27 Aug 2015 06:34:37 +0000 (06:34 +0000)]
am
a69dd6a2: (-s ours) am
99b8820f: Use fingerid 0 when checking failed attempts.
* commit '
a69dd6a246f75bd7603058325287a3f916472a44':
Roshan Pius [Thu, 27 Aug 2015 06:34:19 +0000 (06:34 +0000)]
am
0fdf0449: (-s ours) am
8f596907: Merge "Change sequence of call removal from Phone\'s db." into mnc-dev
* commit '
0fdf044916512dff98b8560b2c1b956f8853216d':
Jorim Jaggi [Thu, 27 Aug 2015 06:34:03 +0000 (06:34 +0000)]
am
0fd074f1: (-s ours) am
6d712e06: Remove volume motion delay
* commit '
0fd074f186f3144054814c928801186e7c5cddfe':
Jeff Sharkey [Thu, 27 Aug 2015 06:33:44 +0000 (06:33 +0000)]
am
5d72dfa1: (-s ours) am
9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev
* commit '
5d72dfa1906e582b6b64743ff265970296cf406a':
Jeff Sharkey [Thu, 27 Aug 2015 06:33:03 +0000 (06:33 +0000)]
am
51c94eee: (-s ours) am
c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev
* commit '
51c94eeeddce89639df8167f515cb678ad650fc1':
David Friedman [Thu, 27 Aug 2015 06:32:20 +0000 (06:32 +0000)]
am
c38c08df: (-s ours) am
2a33526b: am
9568a412: am
3d52c10e: Docs: Adds fugu system-image links and hashes for M-Preview.
* commit '
c38c08df4b4bd5f011640c7581307352c68fd47b':
Robert Greenwalt [Thu, 27 Aug 2015 06:31:55 +0000 (06:31 +0000)]
am
2cff299f: (-s ours) am
8b0f3873: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev
* commit '
2cff299f1b591172703ccba759d9d75653a43ddd':
Adrian Roos [Thu, 27 Aug 2015 06:31:38 +0000 (06:31 +0000)]
am
3fba1a1a: (-s ours) am
7f806ec2: Merge "Dump internal state of ImageWallpaper" into mnc-dev
* commit '
3fba1a1ad1009cf24e0778c216bf7c21f24aff0c':
Chien-Yu Chen [Thu, 27 Aug 2015 06:31:22 +0000 (06:31 +0000)]
am
ef2dbbbd: (-s ours) am
3bbcc46d: Merge "Camera: Enforce ZERO_SHUTTER_LAG mode" into mnc-dev
* commit '
ef2dbbbdbd4d63d5a148251b82f0a92b7b5ae629':
Tingting Wang [Thu, 27 Aug 2015 06:31:05 +0000 (06:31 +0000)]
am
d2e88848: (-s ours) am
4ccf69e1: Merge "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1." into mnc-dev
* commit '
d2e88848f45162f5c4488a2232d10d8040f8e11b':
Alex Klyubin [Thu, 27 Aug 2015 06:30:41 +0000 (06:30 +0000)]
am
67aec4f6: (-s ours) am
d25093d2: Merge "Reject AlgorithmParameters of wrong type." into mnc-dev
* commit '
67aec4f660614281d3161c63cf8f2b47bcc44ebf':
Etan Cohen [Thu, 27 Aug 2015 06:29:38 +0000 (06:29 +0000)]
am
51fff988: (-s ours) am
3aa1b1e5: Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev
* commit '
51fff9886b0fcf64bef7b0976a2fdc29d019dbc7':
Selim Cinek [Thu, 27 Aug 2015 06:29:02 +0000 (06:29 +0000)]
am
161b159a: (-s ours) am
a8c247e0: Merge "Fixed a bug where collapserunnables where dropped" into mnc-dev
* commit '
161b159aa01d0f7f9546336d8f702bff0cacc1e9':
Elliott Hughes [Thu, 27 Aug 2015 06:28:53 +0000 (06:28 +0000)]
am
6bc5c3e1: (-s ours) am
7b12deb5: am
07e1c409: Merge "Android always has <malloc.h>."
* commit '
6bc5c3e1a5945762c61359884938d554c6c0aeb3':
Jason Monk [Thu, 27 Aug 2015 06:28:45 +0000 (06:28 +0000)]
am
2157b8b1: (-s ours) am
fede4258: Merge "Remove bang from not connected wifi" into mnc-dev
* commit '
2157b8b111e6eedf2fa6939107fe720727c30a55':
Eric Laurent [Thu, 27 Aug 2015 06:28:33 +0000 (06:28 +0000)]
am
df15e36e: (-s ours) am
c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev
* commit '
df15e36e19aab89b29e4ed57f63a90e134791970':
Geoff Mendal [Thu, 27 Aug 2015 06:28:25 +0000 (06:28 +0000)]
am
479666cd: (-s ours) am
4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
479666cd067322b974849d4728b53eecfe37a217':
Chris Wren [Thu, 27 Aug 2015 06:28:16 +0000 (06:28 +0000)]
am
6cdaafab: (-s ours) am
32c4802a: Merge "provide a cleaner notification dump" into mnc-dev
* commit '
6cdaafab5621193d9ad9e8b57f070435e5d15828':
Geoff Mendal [Thu, 27 Aug 2015 06:28:07 +0000 (06:28 +0000)]
am
9b6ad206: (-s ours) am
db586e69: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
9b6ad2062193c422409b675762f4e53071b6461f':
Geoff Mendal [Thu, 27 Aug 2015 06:27:45 +0000 (06:27 +0000)]
am
05dfdf14: (-s ours) am
18d4eaf5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
05dfdf14000263020691165ed8625bfb4f2189cb':
Benjamin Franz [Thu, 27 Aug 2015 06:27:16 +0000 (06:27 +0000)]
am
34c562a4: (-s ours) am
c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev
* commit '
34c562a402c4f926f5891f93e9079a8afa44f972':
Geoff Mendal [Thu, 27 Aug 2015 06:26:52 +0000 (06:26 +0000)]
am
21146967: (-s ours) am
20ad9246: (-s ours) Import translations. DO NOT MERGE
* commit '
211469673cc78c1f8f6469b4fc903f14e687376c':
Dirk Dougherty [Thu, 27 Aug 2015 06:26:33 +0000 (06:26 +0000)]
am
c0ae18fe: (-s ours) am
e3bb8e43: am
cc040d58: am
7e8358c6: Merge "Doc change -- update trade practices link." into mnc-preview-docs
* commit '
c0ae18fed93fcbf260718fe6b90fceece5906cd4':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 06:26:25 +0000 (06:26 +0000)]
am
27ee95eb: (-s ours) am
a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev
* commit '
27ee95eb66aacf8d015af8dca2d20d76356a2911':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 06:26:17 +0000 (06:26 +0000)]
am
0e70616c: (-s ours) am
89592760: Merge "Expose time-interval detail query on INetworkStatsSession" into mnc-dev
* commit '
0e70616cb44d583ae2d0afea77810259e600548c':
Dirk Dougherty [Thu, 27 Aug 2015 06:26:09 +0000 (06:26 +0000)]
am
15ed547d: (-s ours) am
bc243440: am
590a25a3: am
70f1aadd: Doc change: add version notes for preview 2.
* commit '
15ed547d7383b8fd20d1d48f41573c2f5429d20a':
Zoltan Szatmary-Ban [Thu, 27 Aug 2015 06:25:55 +0000 (06:25 +0000)]
am
49a15309: (-s ours) am
4d2593d3: Merge "Make StorageMeasurement multiprofile aware." into mnc-dev
* commit '
49a15309ea5012164cc6c014cf6f14fbcfb98b6f':
Neil Fuller [Thu, 27 Aug 2015 06:25:13 +0000 (06:25 +0000)]
am
93492e02: (-s ours) am
26e58f09: am
b05c2beb: Merge "Move listen() over to using android.system.Os"
* commit '
93492e02cc4e5884cd7de8dcec14493255734c29':
Dirk Dougherty [Thu, 27 Aug 2015 06:24:03 +0000 (06:24 +0000)]
am
782e020b: (-s ours) am
8ecba862: am
638ecb76: am
773861f0: Merge "Docs: Localized landing pages for M Preview 2 release." into mnc-preview-docs
* commit '
782e020ba425865b3324a4743687ab0b0c0720ad':
David Friedman [Thu, 27 Aug 2015 06:23:20 +0000 (06:23 +0000)]
am
906402f2: (-s ours) am
d3967e3f: am
0922b82a: am
a7e0bfa6: Docs: Updates to M Preview 2 Download pages.
* commit '
906402f282fa90d0462b3ec114204254fc3bd2b4':
David Friedman [Thu, 27 Aug 2015 06:22:57 +0000 (06:22 +0000)]
am
837825d6: (-s ours) am
a939d7e8: am
cb7a3b6b: am
201cfff4: Merge "Docs: Updated download page for M Preview; new archive page for older versions" into mnc-preview-docs
* commit '
837825d624e32dec66100263f3af534ce018ace7':
David Friedman [Thu, 27 Aug 2015 06:22:38 +0000 (06:22 +0000)]
am
69b67d42: (-s ours) am
f6fd4ef8: am
73ce8abb: am
869050b3: Docs: Updated Preview TOC reflecting the newly localized pages.
* commit '
69b67d42c4919919865354014422574a76960460':
Deepanshu Gupta [Thu, 27 Aug 2015 06:22:01 +0000 (06:22 +0000)]
am
b58a0cd4: (-s ours) am
e32f9c88: Merge changes I29f7abe6,I6c831467 into mnc-dev
* commit '
b58a0cd4fc13e1aa7f16191e2ef02781fdae5f3f':
Deepanshu Gupta [Thu, 27 Aug 2015 06:20:55 +0000 (06:20 +0000)]
am
236387f0: (-s ours) am
65d4f7a6: Merge changes Id0595c4b,Ia1a3e8c3 into mnc-dev
* commit '
236387f05ce34fa5e83141d3eb2cdb3e60727428':
Deepanshu Gupta [Thu, 27 Aug 2015 06:19:56 +0000 (06:19 +0000)]
am
000329eb: (-s ours) am
a4546b0e: Merge "Implement tools:list_item for RecyclerView." into mnc-dev
* commit '
000329eb2b01db13015f16ad89cc5ee16d4de945':
Deepanshu Gupta [Thu, 27 Aug 2015 06:19:12 +0000 (06:19 +0000)]
am
87c587bd: (-s ours) am
0c784ffa: Merge "Add roundess to configuration" into mnc-dev
* commit '
87c587bde4654aad2d96e7be156e0cd46b8d2359':
Deepanshu Gupta [Thu, 27 Aug 2015 06:18:46 +0000 (06:18 +0000)]
am
ad27615c: (-s ours) am
1629717f: Merge "Update tests per new layoutlib_api" into mnc-dev
* commit '
ad27615cad9cda98703fb9cbe99f566941beffaa':
David Friedman [Thu, 27 Aug 2015 06:18:07 +0000 (06:18 +0000)]
am
2e9570ec: (-s ours) am
8d6f6606: am
64e3997a: am
97dcc6fd: Docs: Remaining L10N for M Preview pages (ru).
* commit '
2e9570ec1d2a6487645cc9e07c05a15ca49650aa':
David Friedman [Thu, 27 Aug 2015 06:17:41 +0000 (06:17 +0000)]
am
62af221a: (-s ours) am
743748b1: am
baa723c2: am
14592ef0: Merge "Docs: L10N for remaining M Preview docs (pt-br)." into mnc-preview-docs
* commit '
62af221aa1c0b86ae301691d7be0f0e54e36e536':
David Friedman [Thu, 27 Aug 2015 06:17:13 +0000 (06:17 +0000)]
am
bb8f4af9: (-s ours) am
4ff73b4a: am
1937867b: am
858ef9ab: Docs: L10N of the remaining M-preview pages (es-la)
* commit '
bb8f4af920f770e60552aadf74b62eb2c459fd25':
David Friedman [Thu, 27 Aug 2015 06:16:54 +0000 (06:16 +0000)]
am
2c805fe0: (-s ours) am
68c22cd1: am
73fde03a: am
d6473b0f: Merge "Docs: L10N of remaining M-Preview docs (zh-tw)" into mnc-preview-docs
* commit '
2c805fe01f56676f12d47092bef9b30e3fef76cb':
David Friedman [Thu, 27 Aug 2015 06:16:33 +0000 (06:16 +0000)]
am
b37d3706: (-s ours) am
e6e821d6: am
3c6c05fc: am
4e1d42f9: Merge "Docs: L10N of remaining M Preview pages for zh-cn" into mnc-preview-docs
* commit '
b37d37063f2133c0e0cd8c36720f66241045122e':
Etan Cohen [Thu, 27 Aug 2015 06:16:11 +0000 (06:16 +0000)]
am
21b35c40: (-s ours) am
3e639057: Merge "Add ACCESS_IMS_CALL_SERVICE hidden permission." into mnc-dev
* commit '
21b35c4096d1523c0c4821004d50cb47ef9b4870':
David Friedman [Thu, 27 Aug 2015 06:15:48 +0000 (06:15 +0000)]
am
ea85adc7: (-s ours) am
ebfe2be1: am
3f83aa3f: am
4da25c2e: Docs: L10N of remaining M Preview docs (ko).
* commit '
ea85adc7de8dab84a22345c0ef7f789cdad86d01':
Wale Ogunwale [Thu, 27 Aug 2015 06:15:21 +0000 (06:15 +0000)]
am
25d031b8: (-s ours) am
06bdab9b: Merge "Set AppErrorDialog result during dismissal if it isn\'t already set" into mnc-dev
* commit '
25d031b8fbdb7e7c253006cfcb68565414ddfcb8':
Seigo Nonaka [Thu, 27 Aug 2015 06:14:59 +0000 (06:14 +0000)]
am
cc5311be: (-s ours) am
9d3cd848: Merge "Add libhidcommand_jni.so to required module." into mnc-dev
* commit '
cc5311bead5621bd90f90d9c70b20d93c157bc5d':
Geoff Mendal [Thu, 27 Aug 2015 06:14:42 +0000 (06:14 +0000)]
am
4d375012: (-s ours) am
9a8db293: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
4d375012b16e90073dd97ac39fb2f800117c717f':
Chris Craik [Thu, 27 Aug 2015 06:14:24 +0000 (06:14 +0000)]
am
ea4ef307: (-s ours) am
127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev
* commit '
ea4ef307fb8bf8f4854a5951c6cd84ae5d1d8f97':
David Friedman [Thu, 27 Aug 2015 06:14:04 +0000 (06:14 +0000)]
am
882867dd: (-s ours) am
5544cb42: am
6fa1ee64: am
41a722ab: Merge "Docs: L10N of remaining M-Preview pages (Ja) Bug:
21789313" into mnc-preview-docs
* commit '
882867ddd8e4ed0a03f3c7950c20576449c4741f':
Dianne Hackborn [Thu, 27 Aug 2015 06:13:19 +0000 (06:13 +0000)]
am
f3fe497f: (-s ours) am
b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev
* commit '
f3fe497f754855d7e2b3e0bf01f680201e24bd98':
David Friedman [Thu, 27 Aug 2015 06:12:47 +0000 (06:12 +0000)]
am
7f9fd061: (-s ours) am
05ca442f: am
3d0d02e6: am
dafcaf72: Merge "docs: Preview 2 - Update downloads page" into mnc-preview-docs
* commit '
7f9fd0614c66c0b72fd87b857863feff17997291':
Ian Pedowitz [Thu, 27 Aug 2015 06:12:28 +0000 (06:12 +0000)]
am
263903a0: (-s ours) am
2020178f: Merge "Revert "Set default SMS application to Messenger"" into mnc-dev
* commit '
263903a06b9b66294aec1f5c85758cd45255f08c':
Vineeta Srivastava [Thu, 27 Aug 2015 06:12:20 +0000 (06:12 +0000)]
am
2fbc9a61: (-s ours) am
578eef70: Merge "Enforce camera shutter sound for India" into mnc-dev
* commit '
2fbc9a6173132ef3c76609e05af275f56aab8390':
Dianne Hackborn [Thu, 27 Aug 2015 06:12:11 +0000 (06:12 +0000)]
am
15f858aa: (-s ours) am
f2474d33: Merge "Implement better handling of text in assist." into mnc-dev
* commit '
15f858aadaa49e14fb6568aed279eea387dba073':
Andrew Solovay [Thu, 27 Aug 2015 06:12:03 +0000 (06:12 +0000)]
am
3142e919: (-s ours) am
b2f9c284: am
40122447: am
d73098bc: docs: Added new NORMAL permissions
* commit '
3142e919e9e632a4c38e07492ebe7cee26e85e44':
Svetoslav [Thu, 27 Aug 2015 06:11:55 +0000 (06:11 +0000)]
am
51be65dd: (-s ours) am
3e07ee07: Merge "Grant installer and verifier install permissions robustly" into mnc-dev
* commit '
51be65dd122c2f56bba5460936952e53f344522b':
Jeff Sharkey [Thu, 27 Aug 2015 06:11:47 +0000 (06:11 +0000)]
am
922938df: (-s ours) am
15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev
* commit '
922938dfef47d225726bce0819f3787c0c669fc2':
Christopher Tate [Thu, 27 Aug 2015 06:11:39 +0000 (06:11 +0000)]
am
ebfe5d80: (-s ours) am
15bb16fb: Merge "App linking: permit overlapping link handling" into mnc-dev
* commit '
ebfe5d80a6742285478790951521e73cd8195ea8':
Jim Miller [Thu, 27 Aug 2015 06:11:31 +0000 (06:11 +0000)]
am
3c06c3f9: (-s ours) am
e86f1752: Merge "Use custom theme for keyguard presentation" into mnc-dev
* commit '
3c06c3f9467bbac70dfb2adee5a500a50597597c':
Alan Viverette [Thu, 27 Aug 2015 06:11:08 +0000 (06:11 +0000)]
am
963471f0: (-s ours) am
f12c91f5: Merge "Remember focused child during layout when adapter has stable IDs" into mnc-dev
* commit '
963471f08f2bc85c3dfc47ea15f1f028b9f2c3b6':
Adrian Roos [Thu, 27 Aug 2015 06:10:40 +0000 (06:10 +0000)]
am
590728e8: (-s ours) am
38586bff: Merge "Fix bug that prevented waking from dream" into mnc-dev
* commit '
590728e89dddd517aec0c17d816a3b449f4a5f78':
Robin Lee [Thu, 27 Aug 2015 06:10:19 +0000 (06:10 +0000)]
am
8b529ada: (-s ours) am
846362fa: Merge "Use \'dp\' paddings instead of \'mm\' for VPN dialogs" into mnc-dev
* commit '
8b529adafe7ae6d01118ba61087be2e94d29ac45':
Jim Miller [Thu, 27 Aug 2015 06:10:03 +0000 (06:10 +0000)]
am
0658622a: (-s ours) am
b5e3eba1: Merge "SystemUI/Keyguard: try authenticate finger after authentication failure" into mnc-dev
* commit '
0658622a85736d9138c52ba38f295401977f6035':
Ian Pedowitz [Thu, 27 Aug 2015 06:09:50 +0000 (06:09 +0000)]
am
af4a0c33: (-s ours) am
1c677b1e: Merge "Set default SMS application to Messenger" into mnc-dev
* commit '
af4a0c335cdbd92bd96cc351649f61e4d1c28449':
Andrew Solovay [Thu, 27 Aug 2015 06:09:38 +0000 (06:09 +0000)]
am
7cc25bce: (-s ours) am
700b54ab: am
c9c15793: am
8b9d55e4: docs: Removed extraneous "system components" info
* commit '
7cc25bce13ec88a53f0a0da83072004fc260fb03':
Chien-Yu Chen [Thu, 27 Aug 2015 06:09:20 +0000 (06:09 +0000)]
am
7ca88154: (-s ours) am
3054f595: Merge "Camera2: implement Key.toString()" into mnc-dev
* commit '
7ca881549cd0ad017f2f960ced45a6b55b0796be':
Selim Cinek [Thu, 27 Aug 2015 06:09:00 +0000 (06:09 +0000)]
am
131c6f85: (-s ours) am
cffb98c8: Merge "Fixed a bug where notification where invisible on the lockscreen" into mnc-dev
* commit '
131c6f855b627e59ceb4abcef9769630a626cf56':
Chien-Yu Chen [Thu, 27 Aug 2015 06:08:23 +0000 (06:08 +0000)]
am
ea01d3b8: (-s ours) am
69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev
* commit '
ea01d3b80a2c48b5c45404b5c462f7e438b72b86':
Dongwon Kang [Thu, 27 Aug 2015 06:07:25 +0000 (06:07 +0000)]
am
a6ec812d: (-s ours) am
7a64e976: Merge "MediaSessionManager: make the binder implementation static" into mnc-dev
* commit '
a6ec812d07efc20488b92080a0a2c15a55470241':
Adam Powell [Thu, 27 Aug 2015 06:06:19 +0000 (06:06 +0000)]
am
c4e29c06: (-s ours) am
e9cbf415: Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev
* commit '
c4e29c06ae888113b65bf007705ce4e0b7e34d6b':
Eino-Ville Talvala [Thu, 27 Aug 2015 06:05:48 +0000 (06:05 +0000)]
am
6dbdb753: (-s ours) am
384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev
* commit '
6dbdb75314dcadc30044bfebd8fc9bc49a73aceb':
Jeff Tinker [Thu, 27 Aug 2015 06:05:14 +0000 (06:05 +0000)]
am
315f5014: (-s ours) am
6826b25c: Merge "Report specific exception type on decrypt with invalid session" into mnc-dev
* commit '
315f501486ae9f61c22c3e98a3f8c44a8df7f565':
Alan Viverette [Thu, 27 Aug 2015 06:04:15 +0000 (06:04 +0000)]
am
79dcffbc: (-s ours) am
8830db0a: Merge "Never fully detach header or footer views in AbsListView" into mnc-dev
* commit '
79dcffbcfdbaf51d7647f8cdcddf9e832fa42343':
Wale Ogunwale [Thu, 27 Aug 2015 06:03:12 +0000 (06:03 +0000)]
am
569b91cf: (-s ours) am
880a54f6: Merge "Cleaned-up logic for determining clip rect for transitions animations." into mnc-dev
* commit '
569b91cf7e63bbd7db9d4aeb97b976d78679c8b0':
Jeff Sharkey [Thu, 27 Aug 2015 06:02:20 +0000 (06:02 +0000)]
am
fd871ee6: (-s ours) am
dafaa45c: Merge "Split app move into separate copy/delete steps." into mnc-dev
* commit '
fd871ee6487421746946e6942b6cdb34ca915608':
Makoto Onuki [Thu, 27 Aug 2015 06:01:20 +0000 (06:01 +0000)]
am
927dffb8: (-s ours) am
53d17aee: Merge "Give fixed READ_PHONE_STATE permission to calllog provider" into mnc-dev
* commit '
927dffb87c74a80847929fe013e924a1e9d32861':
Dongwon Kang [Thu, 27 Aug 2015 06:00:36 +0000 (06:00 +0000)]
am
eeb3b025: (-s ours) am
0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev
* commit '
eeb3b025309a6a095b132e14be390ee3db48889d':
Vineeta Srivastava [Thu, 27 Aug 2015 06:00:12 +0000 (06:00 +0000)]
am
2e0cefd8: (-s ours) am
9d918db3: Merge "UsbDeviceManager: Add back support for persistent property" into mnc-dev
* commit '
2e0cefd82f48118d582dc3b1d4e810ea8603c9e8':
Christopher Tate [Thu, 27 Aug 2015 05:59:54 +0000 (05:59 +0000)]
am
e44e8adb: (-s ours) am
7bc8f51a: Merge "Clean up obsolete pending timeout after restoring package metadata" into mnc-dev
* commit '
e44e8adb772106ddbae6a575819fcba3a76ca1a9':
Aravind Akella [Thu, 27 Aug 2015 05:59:29 +0000 (05:59 +0000)]
am
8e2a15a3: (-s ours) am
c5889757: Merge "Clean up get sensorList." into mnc-dev
* commit '
8e2a15a31e7f36b8e9af063e3badc2eb06122f95':
Jorim Jaggi [Thu, 27 Aug 2015 05:58:54 +0000 (05:58 +0000)]
am
22037797: (-s ours) am
588932a5: Always wait for the main app window before starting a transition
* commit '
220377971a7167c017c1ddc987de706cbbe2d058':
Selim Cinek [Thu, 27 Aug 2015 05:58:03 +0000 (05:58 +0000)]
am
470b5d3d: (-s ours) am
7e675645: Merge "Fixed keyguard affordances" into mnc-dev
* commit '
470b5d3d7a48e006133b68cb2de800dff55db56a':
Chris Craik [Thu, 27 Aug 2015 05:57:43 +0000 (05:57 +0000)]
am
9187353c: (-s ours) am
54d1f043: Merge "Simplify matrix copy constructor/load" into mnc-dev
* commit '
9187353c69e7cb6f590dcd11ed3bdb8eef07efc5':
Alex Klyubin [Thu, 27 Aug 2015 05:57:24 +0000 (05:57 +0000)]
am
aec5d199: (-s ours) am
024bce82: Merge "Support loading AES keys with authorized digests." into mnc-dev
* commit '
aec5d1998f753a6f10d845a42abee26f38df79a7':
Andrew Solovay [Thu, 27 Aug 2015 05:57:04 +0000 (05:57 +0000)]
am
22ab84d6: (-s ours) am
a5c82a6b: am
4357181d: am
e44b86b2: docs: Removed READ_EXTERNAL_STORAGE from \'normal\' permissions
* commit '
22ab84d6d35e001249faeb6c32a2ce89db650cc5':
Chris Craik [Thu, 27 Aug 2015 05:56:45 +0000 (05:56 +0000)]
am
2dbd5c0a: (-s ours) am
6ef57e97: Merge "Don\'t update DisplayLists when dumping" into mnc-dev
* commit '
2dbd5c0a886c602e1d5a25b28b85d371c6de1dc0':
xin He [Thu, 27 Aug 2015 05:56:23 +0000 (05:56 +0000)]
am
a9d31673: (-s ours) am
053b407b: Merge "wifi: Fix softAP turn-ON issue in statically loaded driver" into mnc-dev
* commit '
a9d316732e651158ab51c23cc9c8aeca53da3c88':
Neil Fuller [Thu, 27 Aug 2015 05:56:03 +0000 (05:56 +0000)]
am
1108c06a: (-s ours) am
23325440: am
50d11ded: Merge "Reimplement LocalSocket methods using android.system.Os"
* commit '
1108c06aca42137c930f54bfe9effd2b59b4f9a5':