drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,755 Commits 1 Branch 0 Tags
Commit Graph

200755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
25cc56544c am c71f3a2d: am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit 'c71f3a2d4a3b3ab52be08e68646ffcb71b55066a':
  Show correct locked orientation on phones
 2015-07-15 22:57:45 +00:00
Geoff Mendal
4e9cb4e294 am c7167010: (-s ours) am 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'c71670109681040c676895b1db962753db0414e9':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:40 +00:00
Geoff Mendal
812ad1aa4e am a2ab4fc8: (-s ours) am f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'a2ab4fc82629f200d93fa77a29094ff3ecb86af3':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:34 +00:00
Geoff Mendal
34cfc5c83d am c05bf35e: (-s ours) am ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'c05bf35e1771191d2f006e32f99a1d11479c2057':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:28 +00:00
Geoff Mendal
e82dcd329f am 80e9c04e: (-s ours) am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '80e9c04e910f88283f34dddac36f32db291e9c63':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:22 +00:00
Geoff Mendal
2ce2c76498 am 69032a7a: (-s ours) am 0959738e: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '69032a7a237f58a4b7f8f273cbce8cd25285b84b':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:16 +00:00
Geoff Mendal
eafe2996e7 am 15aa75e3: (-s ours) am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '15aa75e3f86f6a10512925f117240d7d2d8b291b':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:10 +00:00
Geoff Mendal
bd7caa7c1c am 97eabdbd: (-s ours) am f427688c: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '97eabdbdc943ec361de9cb948676a75adc2723e8':
  Import translations. DO NOT MERGE
 2015-07-15 22:57:05 +00:00
Jorim Jaggi
aa90ab551c am deb9aa8c: am 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec 
* commit 'deb9aa8cfd89c04d130758f9a82e45f77bba0431':
  Adjust assist disclosure stroke width to spec
 2015-07-15 22:56:59 +00:00
Roshan Pius
0d49a97e4a am 31ab86f8: am 06179c75: am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev 
* commit '31ab86f871be369075dd3432dcd4ebed14e50a78':
  Handle exceptions when accessing Content providers.
 2015-07-15 22:56:53 +00:00
Felipe Leme
1bcd49a9eb am 2ac41a90: am d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit '2ac41a902eb4e2af32ff4063dca03b656baa860f':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 22:56:46 +00:00
Dianne Hackborn
de5cc88306 am f57b5e6f: am 4a56983f: am d193916c: Merge "Fix build." into mnc-dev 
* commit 'f57b5e6f23b9ec6f98d4af75072b87b09303e62d':
  Fix build.
 2015-07-15 22:56:39 +00:00
Jeff Brown
6e4997dbfb am 8bdd92d4: am 0cb1cfdc: am 76c4c666: Add USB port manager. 
* commit '8bdd92d44ea878ff0353c87cfc5ce497aea96911':
  Add USB port manager.
 2015-07-15 22:56:33 +00:00
Jeff Brown
3bc3342347 am b35b8e81: am b3c11805: am 2dbccc19: Clean up USB Manager dump. 
* commit 'b35b8e81cafe52552f800c736ce123d2b1969387':
  Clean up USB Manager dump.
 2015-07-15 22:56:28 +00:00
Adrian Roos
c71f3a2d4a am 2fc6e2b5: am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit '2fc6e2b57ddfac58ce1fbded6f8a64a0b2fc9d70':
  Show correct locked orientation on phones
 2015-07-15 22:45:53 +00:00
Geoff Mendal
c716701096 am 9139d5b0: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '9139d5b0fd3b523deb6fffe534fc07c462604483':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:49 +00:00
Geoff Mendal
a2ab4fc826 am f88916ca: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f88916cabcc3d4ce885226789ecbdb1a7db722b7':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:45 +00:00
Geoff Mendal
c05bf35e17 am ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ccec9777f4ec0ac7d1f50e5b2e0a881d86d12a8b':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:41 +00:00
Geoff Mendal
80e9c04e91 am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f48b416e9806f374f95cfcfc35b60db82bb272a8':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:37 +00:00
Geoff Mendal
69032a7a23 am 0959738e: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '0959738e5c0fda80bb655ae1fe317e3f395c6a72':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:33 +00:00
Geoff Mendal
15aa75e3f8 am 2e51738d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '2e51738d7c93e547dbd484014e11d770270030e0':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:29 +00:00
Geoff Mendal
97eabdbdc9 am f427688c: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'f427688c37561a525927db8003c1fcb3f9cbed94':
  Import translations. DO NOT MERGE
 2015-07-15 22:45:24 +00:00
Jorim Jaggi
deb9aa8cfd am 7be40aaa: am eea8be53: Adjust assist disclosure stroke width to spec 
* commit '7be40aaa6b1df159962134ff8314539d2805ec43':
  Adjust assist disclosure stroke width to spec
 2015-07-15 22:45:20 +00:00
Roshan Pius
31ab86f871 am 06179c75: am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev 
* commit '06179c75c84476e96b99004fb677ef9d50dbcdfc':
  Handle exceptions when accessing Content providers.
 2015-07-15 22:45:16 +00:00
Felipe Leme
2ac41a902e am d9ab0ca2: am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit 'd9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 22:45:11 +00:00
Dianne Hackborn
f57b5e6f23 am 4a56983f: am d193916c: Merge "Fix build." into mnc-dev 
* commit '4a56983fa707985fe5e5ab050acd7306e123d075':
  Fix build.
 2015-07-15 22:45:07 +00:00
Jeff Brown
8bdd92d44e am 0cb1cfdc: am 76c4c666: Add USB port manager. 
* commit '0cb1cfdcc306f78030403c8da22bfcda630c5527':
  Add USB port manager.
 2015-07-15 22:45:03 +00:00
Jeff Brown
b35b8e81ca am b3c11805: am 2dbccc19: Clean up USB Manager dump. 
* commit 'b3c1180538d46a0844620375b67a453acdb456fe':
  Clean up USB Manager dump.
 2015-07-15 22:44:59 +00:00
Adrian Roos
2fc6e2b57d am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit '3a931d028a0c43fe276b0adfdc6b87ac48dd5df3':
  Show correct locked orientation on phones
 2015-07-15 22:28:02 +00:00
Geoff Mendal
9139d5b0fd am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '4155d9f37762a6a91d47c383f9c3a9fd3aa7f884':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:58 +00:00
Geoff Mendal
f88916cabc am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '197e7381576bee4b8e2e7195811fe94d1b1b28ec':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:54 +00:00
Geoff Mendal
ccec9777f4 am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '6e149a2537167f90b1db2430c19ccdf064548b91':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:44 +00:00
Geoff Mendal
f48b416e98 am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'a5516e80ad76fb5cfe520ddd0c5babf2dccf2e5a':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:39 +00:00
Geoff Mendal
0959738e5c am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ff994bd31b2768eb38efb6c623f0fb6e13d9d61b':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:35 +00:00
Geoff Mendal
2e51738d7c am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '36c103d685a6ba0f04c52bad2cb666789f5179dc':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:31 +00:00
Geoff Mendal
f427688c37 am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e2a0d44c8a837ac44dfc627ef3ca8d5242e78959':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:26 +00:00
Jorim Jaggi
7be40aaa6b am eea8be53: Adjust assist disclosure stroke width to spec 
* commit 'eea8be533874f279016279cd68618a6592b3dbed':
  Adjust assist disclosure stroke width to spec
 2015-07-15 22:27:07 +00:00
Roshan Pius
06179c75c8 am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev 
* commit '4e9c63cbe1712f750d5eaaa044e957c7f7696bf8':
  Handle exceptions when accessing Content providers.
 2015-07-15 22:26:55 +00:00
Felipe Leme
d9ab0ca287 am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit '68fd7c798d213bbe304775b13d775ee868abb448':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 22:26:47 +00:00
Dianne Hackborn
4a56983fa7 am d193916c: Merge "Fix build." into mnc-dev 
* commit 'd193916c83015d54466ad998fb9373f15da754a7':
  Fix build.
 2015-07-15 22:26:42 +00:00
Jeff Brown
0cb1cfdcc3 am 76c4c666: Add USB port manager. 
* commit '76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
  Add USB port manager.
 2015-07-15 22:26:38 +00:00
Jeff Brown
b3c1180538 am 2dbccc19: Clean up USB Manager dump. 
* commit '2dbccc1926ea2d3e27c5cfd2d61d2b3d5ed787c0':
  Clean up USB Manager dump.
 2015-07-15 22:26:34 +00:00
Jeff Sharkey
38611265f0 am 973e7227: am 6819696c: am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev 
* commit '973e72270ccbbd44f6e83690ba32735465bb170d':
  Give DCS permission needed to measure all users.
 2015-07-15 22:11:24 +00:00
Jeff Sharkey
6663f84470 am b5405b45: am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev 
* commit 'b5405b45784cebf978b6102d324a1018fe66deb6':
  Only send EXTRA_STACK for private intent.
 2015-07-15 22:11:18 +00:00
Jim Miller
bcedcde809 am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit '204c2de8bb2a804991b8bbd5be9877ac1a52e150':
  Improve tracking of screen on reasons.
 2015-07-15 22:11:11 +00:00
Jeff Sharkey
973e72270c am 6819696c: am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev 
* commit '6819696c0e00ce3805de66f13ec6deda2489fd32':
  Give DCS permission needed to measure all users.
 2015-07-15 21:59:36 +00:00
Jeff Sharkey
b5405b4578 am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev 
* commit '350b99c0027902db22004ea037265349155d7c38':
  Only send EXTRA_STACK for private intent.
 2015-07-15 21:59:31 +00:00
Jim Miller
204c2de8bb am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
* commit 'c7b0435cc709c328da8e2b515ea04c8bc40d1094':
  Improve tracking of screen on reasons.
 2015-07-15 21:59:27 +00:00
Adrian Roos
3a931d028a Merge "Show correct locked orientation on phones" into mnc-dev 2015-07-15 21:56:27 +00:00
Geoff Mendal
4155d9f377 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:56:05 +00:00