OSDN Git Service
Adam Lesinski [Thu, 27 Aug 2015 10:25:27 +0000 (10:25 +0000)]
am
9a9fd61e: (-s ours) am
0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev
* commit '
9a9fd61e0b4a93ef36b13e4ff00621dd594b96cb':
Quddus Chong [Thu, 27 Aug 2015 10:25:10 +0000 (10:25 +0000)]
am
930fa6d6: (-s ours) am
b8fb239a: Merge "docs: Updated API Overview and Behavior Changes docs for M Preview 3." into mnc-dev
* commit '
930fa6d6f640452ff57986587e5e37f49d49fd4e':
Daniel Sandler [Thu, 27 Aug 2015 10:24:59 +0000 (10:24 +0000)]
am
72c982fa: (-s ours) am
9f238a94: Merge "Introducing M Land." into mnc-dev
* commit '
72c982fa247100e845f1ebe1f8b59eae84e9e504':
Daniel Sandler [Thu, 27 Aug 2015 10:24:40 +0000 (10:24 +0000)]
am
fa42d28f: (-s ours) am
8ad3e817: Merge ""I tried to think of the most harmless thing."" into mnc-dev
* commit '
fa42d28f60095d49ef4361c1b21b0e970332e2b9':
Adam Lesinski [Thu, 27 Aug 2015 10:24:29 +0000 (10:24 +0000)]
am
4fe0a446: (-s ours) am
504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev
* commit '
4fe0a44658461cd35df0f85f03bea1c6ee1e9d37':
Julia Reynolds [Thu, 27 Aug 2015 10:24:18 +0000 (10:24 +0000)]
am
9eec1c2a: (-s ours) am
7df411d0: Merge "Clear calling identity before getting the current user." into mnc-dev
* commit '
9eec1c2aa5353f0ec6001cf40632faf50f40ea55':
Jean-Michel Trivi [Thu, 27 Aug 2015 10:24:08 +0000 (10:24 +0000)]
am
2f160d38: (-s ours) am
16fa58cb: Merge "Fix to check the incoming userid argument for RingtonePlayer" into mnc-dev
* commit '
2f160d38c02275150864afaf2649949a00234209':
Chris Tate [Thu, 27 Aug 2015 10:23:59 +0000 (10:23 +0000)]
am
d7a164bf: (-s ours) am
7e7d79ef: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
d7a164bf3ff67a9c37e9879c333e79aacc991e1b':
Dianne Hackborn [Thu, 27 Aug 2015 10:23:49 +0000 (10:23 +0000)]
am
3ffc0f1e: (-s ours) am
81f3a85a: Merge "Fix issue #
22940169: "pm grant" can no longer grant permissions..." into mnc-dev
* commit '
3ffc0f1e81f6a45190cd928759e728ecbdfaf0b9':
Svetoslav Ganov [Thu, 27 Aug 2015 10:23:39 +0000 (10:23 +0000)]
am
03e64e4e: (-s ours) am
b045331f: Merge "Add GTS test to ensure valid default permission grants - framework" into mnc-dev
* commit '
03e64e4edd8fc32fa04a4ca8dfc3184129281a55':
Jeff Sharkey [Thu, 27 Aug 2015 10:23:29 +0000 (10:23 +0000)]
am
b53738f7: (-s ours) am
cfcf6af9: Merge "Method to show DialogFragment allowing state loss." into mnc-dev
* commit '
b53738f71e80760394df1825ee94a60ce9dcca4b':
Joe Fernandez [Thu, 27 Aug 2015 10:23:20 +0000 (10:23 +0000)]
am
619bbdf4: (-s ours) am
37dd5240: Merge "Doc change: Update preview pages for dp3." into mnc-dev
* commit '
619bbdf4a9b22294be8b0a685e1f41b4a10a7127':
Jorim Jaggi [Thu, 27 Aug 2015 10:23:11 +0000 (10:23 +0000)]
am
8de9d445: (-s ours) am
81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
* commit '
8de9d4458347a00333a340e1400a0ef0fe7da9ab':
Joe Fernandez [Thu, 27 Aug 2015 10:23:01 +0000 (10:23 +0000)]
am
c245093f: (-s ours) am
f7557729: Merge "docs: Update uses-sdk-element page with API 23 (M) listing" into mnc-dev
* commit '
c245093f96856c702779d741e7043b847cdc4c22':
Joe Fernandez [Thu, 27 Aug 2015 10:22:47 +0000 (10:22 +0000)]
am
9f65f0a2: (-s ours) am
8d149d7f: Merge "docs: Update developer docs make file to include API 23" into mnc-dev
* commit '
9f65f0a2c00871fd5fa74e241d46ca65a7d3b40f':
Mike Dodd [Thu, 27 Aug 2015 10:22:36 +0000 (10:22 +0000)]
am
93eef423: (-s ours) am
226ae04d: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
* commit '
93eef42349133b5857f538f4ea6278ba561fd536':
Jason Monk [Thu, 27 Aug 2015 10:22:17 +0000 (10:22 +0000)]
am
692e9b34: (-s ours) am
90460c79: Merge "Add more intelligence to bluetooth connection state" into mnc-dev
* commit '
692e9b3404a2ba2260fa50668fbbc76d8c874f21':
Bart Sears [Thu, 27 Aug 2015 10:22:02 +0000 (10:22 +0000)]
am
48ce6d27: (-s ours) am
bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev
* commit '
48ce6d27015fa40291ed1aa4fcf414c3cb6fa818':
Dianne Hackborn [Thu, 27 Aug 2015 10:21:50 +0000 (10:21 +0000)]
am
6d52d761: (-s ours) am
ff9912d5: Merge "Fix issue #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
6d52d7616d339801af6caad77bc50df16df7a813':
Jeff Sharkey [Thu, 27 Aug 2015 10:21:33 +0000 (10:21 +0000)]
am
25919834: (-s ours) am
c97509c0: Merge "Update ifaces when global restriction changes." into mnc-dev
* commit '
259198343bce24500d4abbf063ea579772b5ebb9':
Nick Kralevich [Thu, 27 Aug 2015 10:21:18 +0000 (10:21 +0000)]
am
715bb2f6: (-s ours) am
f3ae2603: am
10e0f079: Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."
* commit '
715bb2f64b22e81e65c0f2dfe47fb8afd9afe3d4':
Andreas Gampe [Thu, 27 Aug 2015 10:21:09 +0000 (10:21 +0000)]
am
3255e2f9: (-s ours) Merge "Hwui: Remove unused variables" into mnc-dev-plus-aosp
* commit '
3255e2f961a005033dd761982fcd06697441bc05':
Hwui: Remove unused variables
Elliott Hughes [Thu, 27 Aug 2015 10:21:01 +0000 (10:21 +0000)]
am
17b4be07: (-s ours) am
39669d7f: am
6fdc6333: Merge "Lose HAVE_ANDROID_OS from frameworks/base."
* commit '
17b4be07fed91da2f770be87f66b1e8918dff52f':
Raph Levien [Thu, 27 Aug 2015 10:20:53 +0000 (10:20 +0000)]
am
9dc2d5cd: (-s ours) am
beabcb92: Merge "Fix Insertion ActionMode not showing on RTL languages" into mnc-dev
* commit '
9dc2d5cd5bcd7519537828794a77a45d0a14ea03':
Eino-Ville Talvala [Thu, 27 Aug 2015 10:20:45 +0000 (10:20 +0000)]
am
09c62671: (-s ours) am
242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
* commit '
09c62671e9d64ad7e3c36c3265c650b3b03b3822':
Mike Dodd [Thu, 27 Aug 2015 10:20:37 +0000 (10:20 +0000)]
am
fdc169c1: (-s ours) am
ad285c16: Merge "Revert "Set default SMS/MMS app to com.android.messaging (new AOSP app)."" into mnc-dev
* commit '
fdc169c1b065d3306347407657964aeb043c47d3':
Adrian Roos [Thu, 27 Aug 2015 10:20:29 +0000 (10:20 +0000)]
am
44a80e20: (-s ours) am
c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev
* commit '
44a80e2013022dea9d7e8bec21f095a19cb6131a':
Jason Monk [Thu, 27 Aug 2015 10:20:22 +0000 (10:20 +0000)]
am
fab69aaa: (-s ours) am
0c762957: Merge "Fix tuner for secondary users" into mnc-dev
* commit '
fab69aaa943bd844f7393aeec4cd0481392835db':
Mike Dodd [Thu, 27 Aug 2015 10:20:14 +0000 (10:20 +0000)]
am
c1372049: (-s ours) am
7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev
* commit '
c1372049d7a6f6ce51bc70a15eb459015e4b0bca':
Todd Kennedy [Thu, 27 Aug 2015 10:20:05 +0000 (10:20 +0000)]
am
b56511a7: (-s ours) am
24e4d48f: Merge "Promote system app permissions" into mnc-dev
* commit '
b56511a7d9c3fbada9a9f522904fb75c958a6738':
Michael Wright [Thu, 27 Aug 2015 10:19:52 +0000 (10:19 +0000)]
am
782fd147: (-s ours) am
e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev
* commit '
782fd14764ff9e579d4473be204843c48895c07c':
Narayan Kamath [Thu, 27 Aug 2015 10:19:41 +0000 (10:19 +0000)]
am
d29382aa: (-s ours) am
bf88205b: Fall back to persist.sys.language/country if locale isn\'t set.
* commit '
d29382aaf0dc68eb5a41621fedabeca4406efe06':
Alex Klyubin [Thu, 27 Aug 2015 10:19:24 +0000 (10:19 +0000)]
am
d03c38e7: (-s ours) am
e19b76cb: Merge "Add more examples of generating/importing keys to Javadocs." into mnc-dev
* commit '
d03c38e7041759dda3c11fc26c691661cfbe8e8b':
Lorenzo Colitti [Thu, 27 Aug 2015 10:19:13 +0000 (10:19 +0000)]
am
6ceed53e: (-s ours) am
e022cb08: Merge "Don\'t attempt to stop the receive thread if we never started it." into mnc-dev
* commit '
6ceed53eeb6d14bb5dbf1f5ae719ad2722de9fb5':
Carlos Valdivia [Thu, 27 Aug 2015 10:18:56 +0000 (10:18 +0000)]
am
47c5338b: (-s ours) am
968fc3ab: Merge "Fix deadlock." into mnc-dev
* commit '
47c5338bc33b69ecbe4cfd719735112ef30f0521':
Julia Reynolds [Thu, 27 Aug 2015 10:18:46 +0000 (10:18 +0000)]
am
c787d8bc: (-s ours) am
77b0d6e9: Merge "New landscape Navigation bar icons." into mnc-dev
* commit '
c787d8bc1343aeee44b65ea632bb107bd20c2238':
Filip Gruszczynski [Thu, 27 Aug 2015 10:18:38 +0000 (10:18 +0000)]
am
6c55ec30: (-s ours) am
59123b9b: Merge "When closing task stack remove reference to display content." into mnc-dev
* commit '
6c55ec301531844089ebcf696b1259ae7282e116':
Dianne Hackborn [Thu, 27 Aug 2015 10:18:29 +0000 (10:18 +0000)]
am
75a3f8f1: (-s ours) am
15f704e7: Merge "Fix issue #
23122445: Add 420 density" into mnc-dev
* commit '
75a3f8f1d27a9281b229193c9c267f03cbcc4c9d':
Wale Ogunwale [Thu, 27 Aug 2015 10:18:21 +0000 (10:18 +0000)]
am
b2a979a3: (-s ours) am
e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev
* commit '
b2a979a3b7033dd3cfd868c80e409026baf52d7e':
Andres Morales [Thu, 27 Aug 2015 10:18:13 +0000 (10:18 +0000)]
am
bb5b3ca2: (-s ours) am
494d6e9b: [fingerprint] use credential owner in FingerprintService
* commit '
bb5b3ca25080ba3c7fd4a3942646efb15265e441':
Winson Chung [Thu, 27 Aug 2015 10:18:05 +0000 (10:18 +0000)]
am
a01479f5: (-s ours) am
8851608d: Merge "Always call onProvidersChanged() when packages containing widgets are updated." into mnc-dev
* commit '
a01479f51513f35a07c555f61970b1155eac0f7e':
Chris Manton [Thu, 27 Aug 2015 10:17:56 +0000 (10:17 +0000)]
am
3080ceb1: (-s ours) am
19aa341a: Merge "Save data registration roaming state" into mnc-dev
* commit '
3080ceb18cd215eb731575136be6716607f2dc6d':
Diego Perez [Thu, 27 Aug 2015 10:17:44 +0000 (10:17 +0000)]
am
0dcad221: (-s ours) am
7d85b543: Merge "Make DelegateManager thread safe" into mnc-dev
* commit '
0dcad221f1bd2852a18a672a7722bbfa50918aca':
Alan Viverette [Thu, 27 Aug 2015 10:17:32 +0000 (10:17 +0000)]
am
d764de10: (-s ours) am
105febd2: Merge "Don\'t re-wrap alert dialog context" into mnc-dev
* commit '
d764de105d43dc0b6ce26dcc9208684b330b2fc1':
Alan Viverette [Thu, 27 Aug 2015 10:17:17 +0000 (10:17 +0000)]
am
db0af526: (-s ours) am
11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev
* commit '
db0af5261f15eecff7ca3538591c96885aa494fc':
Alan Viverette [Thu, 27 Aug 2015 10:16:57 +0000 (10:16 +0000)]
am
3288e632: (-s ours) am
b4eb0640: Merge "Avoid use-after-free race condition when rebasing theme" into mnc-dev
* commit '
3288e632501e30b10786f377be07f8a3f343cad3':
Daniel Sandler [Thu, 27 Aug 2015 10:16:36 +0000 (10:16 +0000)]
am
f18a0cfe: (-s ours) am
ad7719de: Merge "Crash apps with bad notification icons." into mnc-dev
* commit '
f18a0cfe13f5fa920be966d1bfc30ec2d37c3257':
Esteban Talavera [Thu, 27 Aug 2015 10:16:16 +0000 (10:16 +0000)]
am
9e08ac0d: (-s ours) am
4dbb37ae: Merge "Update setApplicationRestrictions documentation" into mnc-dev
* commit '
9e08ac0d74c955ef7a0bea5fd61ac00a5e465419':
Andreas Gampe [Thu, 27 Aug 2015 10:15:56 +0000 (10:15 +0000)]
am
af7855ff: (-s ours) am
b08c24a3: Frameworks/base: Disable Clang in core/jni
* commit '
af7855ff854b8112ed3598c4686187bb643e9d53':
Winson Chung [Thu, 27 Aug 2015 10:15:36 +0000 (10:15 +0000)]
am
85aed84e: (-s ours) am
c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev
* commit '
85aed84e25a7f07cc229efa1749e2bd4f95d184b':
Jorim Jaggi [Thu, 27 Aug 2015 10:15:14 +0000 (10:15 +0000)]
am
b2e34d36: (-s ours) am
f8359cfb: Merge "Don\'t show fingerprint cancellation messages in keyguard" into mnc-dev
* commit '
b2e34d3637d6edd03bb7ce45a7f84a27bc101f9c':
Dianne Hackborn [Thu, 27 Aug 2015 10:14:59 +0000 (10:14 +0000)]
am
919e7cad: (-s ours) am
b2b02092: Merge "Fix issue #
23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
* commit '
919e7cad274ebb9f85a31c597bfbe0416d60cd58':
Matthew Williams [Thu, 27 Aug 2015 10:14:43 +0000 (10:14 +0000)]
am
48d58aad: (-s ours) am
77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev
* commit '
48d58aad651b1c99c6d6e430142941e76fc06d37':
Chris Tate [Thu, 27 Aug 2015 10:14:33 +0000 (10:14 +0000)]
am
2403e51c: (-s ours) am
5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev
* commit '
2403e51c2fba387c147e4e9a48eaa671edd4b086':
Simranjit Kohli [Thu, 27 Aug 2015 10:14:24 +0000 (10:14 +0000)]
am
cb312965: (-s ours) am
301dfe08: Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-dev
* commit '
cb3129656da216179211a1204c51499daf06e2d3':
Torne (Richard Coles) [Thu, 27 Aug 2015 10:14:12 +0000 (10:14 +0000)]
am
081905c5: (-s ours) am
c5283927: Close ZipFiles correctly in WebViewFactory.
* commit '
081905c5826fb72c9a19aaead6797029b0fea436':
Jason Monk [Thu, 27 Aug 2015 10:13:57 +0000 (10:13 +0000)]
am
eda0838f: (-s ours) am
4218e46a: Merge "Initialize network name better in NetworkController" into mnc-dev
* commit '
eda0838faa27d514334169f53b136f73fccab524':
Paul Mclean [Thu, 27 Aug 2015 10:13:40 +0000 (10:13 +0000)]
am
624037df: (-s ours) am
a2e39c6a: Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API." into mnc-dev
* commit '
624037df1521398592471531951b1b89cbf4d686':
Paul Mclean [Thu, 27 Aug 2015 10:13:19 +0000 (10:13 +0000)]
am
ef23eb24: (-s ours) am
beda6e2b: Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."" into mnc-dev
* commit '
ef23eb24d5f7c3cc62b46dc01b6545a6b7fdbf2a':
Svetoslav Ganov [Thu, 27 Aug 2015 10:13:02 +0000 (10:13 +0000)]
am
8a23ad62: (-s ours) am
90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev
* commit '
8a23ad62c5fc9b2df63bf5266109a6c85254b591':
Dianne Hackborn [Thu, 27 Aug 2015 10:12:37 +0000 (10:12 +0000)]
am
416605e4: (-s ours) am
fc81be94: Merge "Fix issue #
23037093: "Write system settings" permission value fails..." into mnc-dev
* commit '
416605e450b4caa6988ea6feeae89305a1e822fb':
Billy Lau [Thu, 27 Aug 2015 10:12:13 +0000 (10:12 +0000)]
am
199edc5c: (-s ours) am
70f998e5: Merge "Bug:
21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
* commit '
199edc5ca66cdecca4f9d53953da48c60d41d988':
Dianne Hackborn [Thu, 27 Aug 2015 10:11:48 +0000 (10:11 +0000)]
am
10faec4b: (-s ours) am
f0e5501e: Merge "Fix issue #
22989030: Separate battery whitelists" into mnc-dev
* commit '
10faec4bc054536b4cce7c8cbc8faa367c397efe':
Matthew Williams [Thu, 27 Aug 2015 10:11:24 +0000 (10:11 +0000)]
am
6dc2ac39: (-s ours) am
9d929558: Merge "Correctly skip files that are excluded from restore" into mnc-dev
* commit '
6dc2ac39e5913ceb5348d2e1e41af0ac95f59592':
Neil Fuller [Thu, 27 Aug 2015 10:11:04 +0000 (10:11 +0000)]
am
cf9b8251: (-s ours) am
14b884c1: am
daf8d905: Merge "Add ICU as a java library for docs."
* commit '
cf9b82518cc9f5d232a3b460dd8348d42b3132e8':
Shirish Kalele [Thu, 27 Aug 2015 10:10:50 +0000 (10:10 +0000)]
am
1451df28: (-s ours) am
027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev
* commit '
1451df28162978ac0609690357d8f0d9e1635c16':
Nicolas Prévot [Thu, 27 Aug 2015 10:10:37 +0000 (10:10 +0000)]
am
d63cb337: (-s ours) am
288e82f8: Merge "Keep intent verification status of system apps when uninstalling them." into mnc-dev
* commit '
d63cb3377405861632d8a0fac758d301b286b11b':
Julia Reynolds [Thu, 27 Aug 2015 10:10:26 +0000 (10:10 +0000)]
am
936d2022: (-s ours) am
9dc4d50b: Merge "Update Navigation bar assets." into mnc-dev
* commit '
936d2022e1933c9b9932b55fdd8c0dcbff42da48':
Jason Monk [Thu, 27 Aug 2015 10:10:10 +0000 (10:10 +0000)]
am
59769181: (-s ours) am
69ed3308: Merge "Allow system to disable lockscreen" into mnc-dev
* commit '
59769181a52cd7dc2da12ef324c6a2336540d627':
Amith Yamasani [Thu, 27 Aug 2015 10:09:51 +0000 (10:09 +0000)]
am
d512325a: (-s ours) am
1fbc1b3b: Merge "Fix partial user cleanup on restart" into mnc-dev
* commit '
d512325aaa89b03d7f0fccebb7d093324d95257d':
Chris Tate [Thu, 27 Aug 2015 10:09:37 +0000 (10:09 +0000)]
am
d39fb4af: (-s ours) am
c376afb4: Merge "Wait a bit longer for wifi to shut down before rewriting the config" into mnc-dev
* commit '
d39fb4afb1614669f8f4ec22aa36bc7882eadd63':
Dianne Hackborn [Thu, 27 Aug 2015 10:09:18 +0000 (10:09 +0000)]
am
0e8b4fa0: (-s ours) am
3d06ea03: Merge "Debugging for issue #
22556778: Starting under voice control not allowed" into mnc-dev
* commit '
0e8b4fa0ecf2165bfc5fd34911d5e60f9b961a83':
Dianne Hackborn [Thu, 27 Aug 2015 10:08:58 +0000 (10:08 +0000)]
am
207c6908: (-s ours) am
53d6cddb: Merge "Fix issue #
22846750: Starting Screenie Now On Tap crashes USA Today" into mnc-dev
* commit '
207c6908cb8c6c6f91245d60844f1c8845e35781':
Michael Wright [Thu, 27 Aug 2015 10:08:44 +0000 (10:08 +0000)]
am
56700e24: (-s ours) am
d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev
* commit '
56700e24b4ea68701589ff731a3397fa8ee47ca8':
Svetoslav Ganov [Thu, 27 Aug 2015 10:08:33 +0000 (10:08 +0000)]
am
c9d50277: (-s ours) am
38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev
* commit '
c9d502779832242914d70c956306faca6d97d193':
Jason Monk [Thu, 27 Aug 2015 10:08:23 +0000 (10:08 +0000)]
am
0607e785: (-s ours) am
77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev
* commit '
0607e7857c4f827a3588d621e2f8d99efced8e54':
Jeff Davidson [Thu, 27 Aug 2015 10:08:12 +0000 (10:08 +0000)]
am
393a27c8: (-s ours) am
1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev
* commit '
393a27c89ccd0fb2d436eda5a918b5c83aff2c93':
Wale Ogunwale [Thu, 27 Aug 2015 10:07:59 +0000 (10:07 +0000)]
am
6b415901: (-s ours) am
a0ef49c4: Look for recent tasks in live stacks.
* commit '
6b415901155084fd4aaa3eba0ad3b3aa52a6a63f':
Deepanshu Gupta [Thu, 27 Aug 2015 10:07:48 +0000 (10:07 +0000)]
am
5cb02008: (-s ours) am
8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev
* commit '
5cb02008f9187ebcca2f24ac6d17f7ac26d1ff3e':
Deepanshu Gupta [Thu, 27 Aug 2015 10:07:38 +0000 (10:07 +0000)]
am
1cf52f6b: (-s ours) am
385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev
* commit '
1cf52f6be944037ecfd29fcd5be37806fdf317fb':
Andres Morales [Thu, 27 Aug 2015 10:07:28 +0000 (10:07 +0000)]
am
84fd6e97: (-s ours) am
85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev
* commit '
84fd6e9733d39d2e61a3bab8f5c1c17892acdca7':
Winson Chung [Thu, 27 Aug 2015 10:07:14 +0000 (10:07 +0000)]
am
342b2044: (-s ours) am
bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev
* commit '
342b20447a2f024d7f79138c25e7b6638cb5e97a':
Wei Jia [Thu, 27 Aug 2015 10:06:59 +0000 (10:06 +0000)]
am
7e758862: (-s ours) am
a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev
* commit '
7e7588629910b50bab8dc20b3b439a7ee04a85e4':
Jeff Sharkey [Thu, 27 Aug 2015 10:06:46 +0000 (10:06 +0000)]
am
3d4f4b33: (-s ours) am
cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev
* commit '
3d4f4b33fdb86ad457e8bde878787025597d222b':
Chris Wren [Thu, 27 Aug 2015 10:06:35 +0000 (10:06 +0000)]
am
816f07bc: (-s ours) am
93f3fc87: Merge "add metrics to assistant" into mnc-dev
* commit '
816f07bce057fdbe9f50c4cb0a2b1cbf111fb660':
Benjamin Franz [Thu, 27 Aug 2015 10:06:22 +0000 (10:06 +0000)]
am
dfa85910: (-s ours) am
339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev
* commit '
dfa8591068a7f7899298da229fb6dea6585a2737':
Svetoslav Ganov [Thu, 27 Aug 2015 10:06:09 +0000 (10:06 +0000)]
am
80dc28e7: (-s ours) am
38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev
* commit '
80dc28e72fe6a8f11ae867496e93b6cb7103d83f':
Paul Mclean [Thu, 27 Aug 2015 10:05:59 +0000 (10:05 +0000)]
am
0c3c81ef: (-s ours) am
af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev
* commit '
0c3c81ef037e89e67e7d0d7ccc176c12e6637184':
Paul Mclean [Thu, 27 Aug 2015 10:05:48 +0000 (10:05 +0000)]
am
9048088d: (-s ours) am
c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev
* commit '
9048088de5d54e1560d7ca16034b3ca7ed72382c':
Alan Viverette [Thu, 27 Aug 2015 10:05:38 +0000 (10:05 +0000)]
am
ad853777: (-s ours) am
c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev
* commit '
ad8537778f4fd3a4363b3ce2c8db744b5acdbb2c':
Dianne Hackborn [Thu, 27 Aug 2015 10:05:27 +0000 (10:05 +0000)]
am
aa8daf78: (-s ours) am
6b0f1e78: Merge "Fix issue #
22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '
aa8daf7851044e6d5676bdb7578cca7e25b0484a':
Chet Haase [Thu, 27 Aug 2015 10:05:17 +0000 (10:05 +0000)]
am
26762506: (-s ours) am
da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev
* commit '
26762506bcf9f6d401050d0744ddf3639e1a05b5':
Alan Treadway [Thu, 27 Aug 2015 10:05:06 +0000 (10:05 +0000)]
am
e4b8c760: (-s ours) am
190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '
e4b8c760ba64e20b1a9b6e745502c91b98d27fb5':
Michael Wright [Thu, 27 Aug 2015 10:04:55 +0000 (10:04 +0000)]
am
46b7af57: (-s ours) am
d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev
* commit '
46b7af57d7fd4354139801785a3eeb0579f4b6f9':
Michael Wright [Thu, 27 Aug 2015 10:04:42 +0000 (10:04 +0000)]
am
7a125e45: (-s ours) am
eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev
* commit '
7a125e455d9b56d33d8dbc7c962260c2c4434a5a':
Julia Reynolds [Thu, 27 Aug 2015 10:04:25 +0000 (10:04 +0000)]
am
24d7c503: (-s ours) am
a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
* commit '
24d7c503a1a8c72e9541e33a7e6412d0591d546f':
Geoff Mendal [Thu, 27 Aug 2015 10:04:05 +0000 (10:04 +0000)]
am
307be111: (-s ours) am
375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
307be111b06d11c376936329e5ef878a1388f2f5':
Mitchell Wills [Thu, 27 Aug 2015 10:03:47 +0000 (10:03 +0000)]
am
088c8de2: (-s ours) am
d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev
* commit '
088c8de233134294049129bc5a542d61a1740d5d':
Yusuke Sato [Thu, 27 Aug 2015 10:03:33 +0000 (10:03 +0000)]
am
e15a5871: (-s ours) am
61234dea: am
bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
* commit '
e15a5871bdba6aef1febbf14cdd58864a9e905f9':
Amit Mahajan [Thu, 27 Aug 2015 10:03:20 +0000 (10:03 +0000)]
am
96e2975c: (-s ours) am
be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev
* commit '
96e2975cbb22ecca4c00bf237ef4027f951a7e73':
OSDN Git Service
