OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
resolved conflicts for merge of c53ad4cd to jb-mr2-dev
[android-x86/frameworks-base.git]
/
Android.mk
2014-03-20
Marco Nelissen
resolved conflicts for merge of c53ad4cd to jb-mr2-dev
blob
|
commitdiff
2014-03-20
Marco Nelissen
am 81fbdade: resolved conflicts for merge of 534f3e94...
blob
|
commitdiff
|
diff to current
2014-03-20
Marco Nelissen
resolved conflicts for merge of 534f3e94 to jb-mr1-dev
blob
|
commitdiff
|
diff to current
2014-03-20
Marco Nelissen
am a3337bc7: Merge "Verify certificates" into jb-dev
blob
|
commitdiff
|
diff to current
2014-03-19
Victoria Lease
am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f...
blob
|
commitdiff
2014-03-19
Victoria Lease
am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some...
blob
|
commitdiff
|
diff to current
2014-03-19
Victoria Lease
am 183f97b7: am 1c12f9e7: malloc some advances
blob
|
commitdiff
|
diff to current
2014-03-19
Victoria Lease
am 1c12f9e7: malloc some advances
blob
|
commitdiff
|
diff to current
2014-03-18
Adrian Roos
am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am...
blob
|
commitdiff
2014-03-18
Adrian Roos
am ecba937b: DO NOT MERGE - Fix keyguard pattern lockou...
blob
|
commitdiff
|
diff to current
2014-03-13
Craig Mautner
Resolved conflicts for merge of ad63d914 to jb-mr2-dev
blob
|
commitdiff
2014-03-13
Craig Mautner
am 1f52437d: Show the keyguard if unsecure window on top
blob
|
commitdiff
|
diff to current
2014-02-27
Paul Lawrence
am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef...
blob
|
commitdiff
2014-02-27
Paul Lawrence
am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenti...
blob
|
commitdiff
|
diff to current
2014-02-27
Paul Lawrence
am da37ed8b: am b9ba0c6c: Prevent authenticators from...
blob
|
commitdiff
|
diff to current
2014-02-27
Paul Lawrence
am b9ba0c6c: Prevent authenticators from using Settings...
blob
|
commitdiff
|
diff to current
2014-01-13
David Christie
am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377...
blob
|
commitdiff
2014-01-13
David Christie
am a87bdc1f: Merge commit \'bc39746e\' into manualmerge
blob
|
commitdiff
|
diff to current
2014-01-10
David Christie
Merge commit 'bc39746e' into manualmerge
blob
|
commitdiff
|
diff to current
2014-01-10
David Christie
am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am...
blob
|
commitdiff
2014-01-10
David Christie
am 6826387e: DO NOT MERGE: Clear cached locations when...
blob
|
commitdiff
|
diff to current
2014-01-10
David Christie
am 8e0c7768: DO NOT MERGE: Clear cached locations when...
blob
|
commitdiff
|
diff to current
2013-11-08
Christopher Tate
am 05e3f55f: am 1d8f592a: am ef12b1d4: am ea198841...
blob
|
commitdiff
2013-11-08
Christopher Tate
am ae229d99: am 43253333: am 50cbfd55: System package...
blob
|
commitdiff
|
diff to current
2013-11-08
Christopher Tate
am 43253333: am 50cbfd55: System package permission...
blob
|
commitdiff
|
diff to current
2013-11-08
Christopher Tate
am 50cbfd55: System package permission decls take prece...
blob
|
commitdiff
|
diff to current
2013-09-27
Amith Yamasani
am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116...
blob
|
commitdiff
2013-09-27
Amith Yamasani
am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantia...
blob
|
commitdiff
|
diff to current
2013-09-27
Amith Yamasani
am ba1ae3af: am 42786418: Don\'t instantiate non-Fragme...
blob
|
commitdiff
|
diff to current
2013-09-27
Amith Yamasani
am 42786418: Don\'t instantiate non-Fragments in Fragme...
blob
|
commitdiff
|
diff to current
2013-08-14
Kenny Root
am 999ddae7: am ae24c0d5: am bf15c7ce: am dceda36b...
blob
|
commitdiff
2013-08-14
Kenny Root
am 3bc3240f: am a6226a2d: am 32c99004: Use hostname...
blob
|
commitdiff
|
diff to current
2013-08-14
Kenny Root
am a6226a2d: am 32c99004: Use hostname verifier directl...
blob
|
commitdiff
|
diff to current
2013-08-14
Kenny Root
am 32c99004: Use hostname verifier directly instead...
blob
|
commitdiff
|
diff to current
2013-07-19
Joe Fernandez
am 658374d5: am 2685febd: am 6f75a73c: Merge "docs...
blob
|
commitdiff
2013-07-18
Scott Main
am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo...
blob
|
commitdiff
2013-07-18
Dirk Dougherty
resolved conflics for merge of 54201120 to jb-mr2-dev
blob
|
commitdiff
2013-07-12
Scott Main
am ca4b112e: am 546ac85a: am ad17523d: add warning...
blob
|
commitdiff
2013-07-12
Scott Main
am e920ab1a: am a618e938: am c660c608: Merge "add Toshi...
blob
|
commitdiff
2013-07-12
Dirk Dougherty
am c1addd47: am c7da42d7: am f7832a35: am d6bbda24...
blob
|
commitdiff
2013-07-12
Scott Main
am 3c13e528: am 536fa1bb: am 84ad0894: fix markup error...
blob
|
commitdiff
2013-07-11
Scott Main
am 603c3d8a: am 3e82a9c9: am 276f0ce4: update Android...
blob
|
commitdiff
2013-07-09
Scott Main
am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update...
blob
|
commitdiff
2013-07-09
Dirk Dougherty
am cfb8f9a0: am 3059c708: am d5fee164: Merge "docs...
blob
|
commitdiff
2013-07-09
Satoshi Kataoka
Merge "Revert "Stop marking gamepads as keyboards"...
blob
|
commitdiff
2013-07-09
Joe Malin
am 46e8ca92: am a4d3dedc: am 420b8212: am a59eb93d...
blob
|
commitdiff
2013-07-09
Scott Main
am 61e1a650: am e4d65d24: am eceeaf11: add link to...
blob
|
commitdiff
2013-07-08
Scott Main
am 375d9f33: am b13f9eeb: am 9c35004e: add xxhdpi infor...
blob
|
commitdiff
2013-07-08
Scott Main
am 637c15df: am 98dc0c44: am 31da6322: dashboard update...
blob
|
commitdiff
2013-07-08
Joe Malin
am 07797c45: am 5c27ec22: am c7d3d28b: am 8b3c7d0c...
blob
|
commitdiff
2013-06-24
Dirk Dougherty
am eadad05c: am d8dff038: am 1c77f5e2: am 1c111395...
blob
|
commitdiff
2013-06-24
Dirk Dougherty
am 6755a4d4: am 757b943a: am b2e3fb4f: am 9db29158...
blob
|
commitdiff
2013-06-21
kmccormick
am 107e4830: am 3f4759a0: am 947857c1: am cce88002...
blob
|
commitdiff
2013-06-21
Dirk Dougherty
am c496c2a8: am 68630bed: am 8054c46e: am e4bc7d81...
blob
|
commitdiff
2013-06-21
Scott Main
am 20eac772: am 334dadec: am 033cfd7c: Merge "add Arabi...
blob
|
commitdiff
2013-06-18
Scott Main
am 23f33bda: am 6b55515e: am 41b08da8: replace \'develo...
blob
|
commitdiff
2013-06-14
Daniel Sandler
Merge "Temporarily restore some support for icon==0...
blob
|
commitdiff
2013-06-14
Scott Main
am 0b3fe078: am a17201a8: am 7190a059: fix transition...
blob
|
commitdiff
2013-06-14
Scott Main
am d2ad6dc5: am 6af13a74: am ec025db4: change studio...
blob
|
commitdiff
2013-06-13
Scott Main
am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninep...
blob
|
commitdiff
2013-06-13
kmccormick
am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee...
blob
|
commitdiff
2013-06-13
Dirk Dougherty
am 14ef5964: am 5161fdf3: am e5bde8e0: am bd9e41ba...
blob
|
commitdiff
2013-06-13
Dirk Dougherty
am 2b336ce4: am 94e207b9: am 3574bef4: am 47f5c410...
blob
|
commitdiff
2013-06-11
Scott Main
am 8f678878: am 6e15b52e: am 7728e1d6: replace obsolete...
blob
|
commitdiff
2013-06-10
Scott Main
am d731c902: am f0380a26: am 343f581d: Merge "fix typo...
blob
|
commitdiff
2013-06-07
Scott Main
am a7ba45ec: am 7381c7e5: am b2b216e7: add links to...
blob
|
commitdiff
2013-06-06
Scott Main
am 6e3c1222: am 47029086: am 2f55af55: add redirects...
blob
|
commitdiff
2013-06-06
Scott Main
am c090ce8c: am c5131567: am 2d312a98: Merge "add desig...
blob
|
commitdiff
2013-06-06
Dirk Dougherty
am f1469855: am 86927797: am cf35c5e3: am 497584ed...
blob
|
commitdiff
2013-06-06
kmccormick
am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33...
blob
|
commitdiff
2013-06-04
Joe Malin
am 305cf97b: am 60776093: am 029099ff: am f4b21585...
blob
|
commitdiff
2013-06-04
Dirk Dougherty
am 59b77878: am 63c904c2: am 4c8caaa2: am 5ca78f59...
blob
|
commitdiff
2013-06-03
Joe Malin
am 2618ac55: am a37bda7b: am 468d82bb: am 6bf45dc7...
blob
|
commitdiff
2013-06-03
Scott Main
am 564889b1: am 4a024be4: am 4cef8150: Merge "update...
blob
|
commitdiff
2013-06-01
Dirk Dougherty
am fdc0c861: am b18c7254: am a404a629: am 6fe992d8...
blob
|
commitdiff
2013-05-31
Jim Miller
Merge "Fix keyguard issue where an incoming SMS would...
blob
|
commitdiff
2013-05-31
kmccormick
am 7356dde4: am a75fb065: am c02821ef: am eca01252...
blob
|
commitdiff
2013-05-31
Scott Main
am 75e12713: am c1032cca: am ca9948ae: revise migrating...
blob
|
commitdiff
2013-05-31
Joe Malin
am 13c305e9: am 09bc2f2d: am 7d469061: am 62ba3609...
blob
|
commitdiff
2013-05-30
Scott Main
am c7dda645: am 77da4440: am 25a49f9f: fix IE 7/8 bugs...
blob
|
commitdiff
2013-05-30
kmccormick
am fa312ff1: am 33b117c4: am 6959f7fa: am 4f3cadaf...
blob
|
commitdiff
2013-05-30
Jason Noguchi
Merge "Refactor of camera stress test to add camera...
blob
|
commitdiff
2013-05-29
Scott Main
am 9940dc4e: am 408c6601: am 79bff4c1: fix FF bug wrt...
blob
|
commitdiff
2013-05-29
Joe Malin
am b8339676: am 4aeb8cb3: am 1e4cfd8e: am f0bca903...
blob
|
commitdiff
2013-05-29
Scott Main
am 40f8668a: am ca725a1a: am 92ff5862: Merge "clean...
blob
|
commitdiff
2013-05-29
Scott Main
am 8cf04a40: am efbcdcd1: am 248573b8: update homepage...
blob
|
commitdiff
2013-05-29
Scott Main
am d0a87a5d: am 54fd2ab2: am 04a36f70: Merge "add page...
blob
|
commitdiff
2013-05-29
Dirk Dougherty
am f64588a2: am de8ac602: am 963e3ec5: am 71d1af4a...
blob
|
commitdiff
2013-05-29
Santos Cordon
am 57f0de12: am d8754689: am c72949c6: am 7999c228...
blob
|
commitdiff
2013-05-28
Scott Main
am 5bd67944: am 5fbe17fe: am 27ab718e: Merge "update...
blob
|
commitdiff
2013-05-28
Scott Main
am 6e5ee7dd: am ea325978: am 005d2afb: Merge "docs...
blob
|
commitdiff
2013-05-28
Scott Main
am afaff6e2: am fb22f9cb: am 5d64a193: Merge "update...
blob
|
commitdiff
2013-05-28
Scott Main
am 43fa2b88: am 718011ac: am d4b710c6: new android...
blob
|
commitdiff
2013-05-26
Matthew Xie
Merge "Revert "Change GATT_FAILURE from 0 to 0x101...
blob
|
commitdiff
2013-05-26
Matthew Xie
Merge "Change GATT_FAILURE from 0 to 0x101" into jb...
blob
|
commitdiff
2013-05-25
Yu Shan Emily Lau
Merge "Update test with CamercorderProfile video size...
blob
|
commitdiff
2013-05-25
Romain Guy
Merge "TransitionDrawable should not become a LayerDraw...
blob
|
commitdiff
2013-05-24
Alan Viverette
Merge "DO NOT MERGE. Fix number picker accessibility...
blob
|
commitdiff
2013-05-24
Deepanshu Gupta
Merge "Add missing native methods." into jb-mr2-dev
blob
|
commitdiff
2013-05-24
Robert Greenwalt
Merge "Use the old interface when resetting connections...
blob
|
commitdiff
next