| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am ea294903: am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected ... | Nick Pelly | 2010-12-06 | 1 | -1/+0 |
| |\ | |||||
| | * | am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast lis... | Nick Pelly | 2010-12-06 | 1 | -1/+0 |
| | |\ | |||||
| | | * | Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into ging... | Nick Pelly | 2010-12-06 | 1 | -1/+0 |
| | | |\ | |||||
| | | | * | Remove ACTION_TAG_DISCOVERED from protected broadcast list. | Nick Pelly | 2010-12-06 | 1 | -1/+0 |
| * | | | | Merge "Make webview edges behave the same way abslistview overscroll edges do." | Mindy Pereira | 2010-12-06 | 2 | -9/+12 |
| |\ \ \ \ | |||||
| | * | | | | Make webview edges behave the same way abslistview overscroll edges do. | Mindy Pereira | 2010-12-06 | 2 | -9/+12 |
| * | | | | | Merge "Clean up button bar styles" | Adam Powell | 2010-12-06 | 11 | -320/+74 |
| |\ \ \ \ \ | |||||
| | * | | | | | Clean up button bar styles | Adam Powell | 2010-12-06 | 11 | -320/+74 |
| * | | | | | | Merge "Propagate the concept of "packed opcode" values." | Dan Bornstein | 2010-12-06 | 1 | -1/+2 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | Propagate the concept of "packed opcode" values. | Dan Bornstein | 2010-12-06 | 1 | -1/+2 |
| * | | | | | | am 465e88eb: am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response t... | Jean-Baptiste Queru | 2010-12-06 | 1 | -4/+7 |
| |\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| | * | | | | am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout." | Jean-Baptiste Queru | 2010-12-06 | 1 | -4/+7 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | am 1d67fa5b: Merge "Changing connect and response timeout." | Jean-Baptiste Queru | 2010-12-06 | 1 | -4/+7 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | Merge "Changing connect and response timeout." | Jean-Baptiste Queru | 2010-12-06 | 1 | -4/+7 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Changing connect and response timeout. | Henrik Baard | 2010-12-06 | 1 | -4/+7 |
| * | | | | | | | | Merge "Test that we use proxies specified by system properties." | Jesse Wilson | 2010-12-06 | 2 | -142/+266 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Test that we use proxies specified by system properties. | Jesse Wilson | 2010-12-06 | 2 | -142/+266 |
| * | | | | | | | | | Merge "make sure that pending operation reconstituted from disk always have a... | Fred Quintana | 2010-12-06 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | make sure that pending operation reconstituted from disk | Fred Quintana | 2010-12-06 | 1 | -1/+5 |
| * | | | | | | | | | | Merge "Merge from gingerbread-plus-aosp" | Jean-Baptiste Queru | 2010-12-06 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge from gingerbread-plus-aosp | Jean-Baptiste Queru | 2010-12-06 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | am 005dd44b: am 864b1e00: Merge "NumberPicker: Set formatter local value to US." | Jean-Baptiste Queru | 2010-12-06 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | |||||
| | | | * | | | | | | | | am 864b1e00: Merge "NumberPicker: Set formatter local value to US." | Jean-Baptiste Queru | 2010-12-06 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | | | |||||
| | | | | * | | | | | | | NumberPicker: Set formatter local value to US. | Chen Libao | 2010-12-06 | 1 | -1/+2 |
| | | | | | |_|/ / / / | | | | |/| | | | | | |||||
| * | | | | | | | | | | Merge "Add inPreferQualityOverSpeed into BitmapFactory.Options." | Wei-Ta Chen | 2010-12-06 | 3 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| | * | | | | | | | | | Add inPreferQualityOverSpeed into BitmapFactory.Options. | Wei-Ta Chen | 2010-12-06 | 3 | -0/+12 |
| * | | | | | | | | | | Merge from gingerbread-plus-aosp | Jean-Baptiste Queru | 2010-12-06 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | | am c1576ad6: Update the docs to clarify the ordering constraints. | Jeff Hamilton | 2010-12-05 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | | * | | | | | | | | Update the docs to clarify the ordering constraints. | Jeff Hamilton | 2010-12-05 | 1 | -0/+5 |
| | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | | Merge "Moved Paste popup window up in TextView" | Gilles Debunne | 2010-12-06 | 3 | -54/+38 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Moved Paste popup window up in TextView | Gilles Debunne | 2010-12-06 | 3 | -54/+38 |
| | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | | am cbf4e352: am 3d524e56: Merge gingerbread-nfc into gingerbread | Nick Pelly | 2010-12-06 | 3 | -1/+86 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | | am 3d524e56: Merge gingerbread-nfc into gingerbread | Nick Pelly | 2010-12-05 | 3 | -1/+86 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | | Merge gingerbread-nfc into gingerbread | Nick Pelly | 2010-12-05 | 3 | -1/+86 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | First implementation of MifareUltralight | Jan Brands | 2010-12-03 | 3 | -1/+86 |
| | | | * | | | | | | | Merge remote branch 'ohd/gingerbread' into merge | Jeff Hamilton | 2010-12-02 | 19 | -164/+1165 |
| | | | |\ \ \ \ \ \ \ | |||||
| * | | | \ \ \ \ \ \ \ | resolved conflicts for merge of 28e8c66d to master | Nick Pelly | 2010-12-06 | 18 | -563/+1146 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| | * | | | | | | | | | am d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into ging... | Nick Pelly | 2010-12-05 | 18 | -563/+1146 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread | Nick Pelly | 2010-12-05 | 18 | -563/+1146 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge branch gingerbread-nfc into gingerbread. | Nick Pelly | 2010-12-05 | 18 | -563/+1146 |
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | | * | | | | | | | Fixed technology name typo's. | Martijn Coenen | 2010-12-01 | 1 | -3/+3 |
| | | | | * | | | | | | | Implement historical bytes / attrib on IsoDep | Martijn Coenen | 2010-11-29 | 1 | -2/+13 |
| | | | | * | | | | | | | Provide system code and manufacturer code for Felica tech. | Martijn Coenen | 2010-11-25 | 1 | -0/+20 |
| | | | | * | | | | | | | Fixed NfcAdapter init and getTechnology(). | Martijn Coenen | 2010-11-24 | 2 | -5/+14 |
| | | | | * | | | | | | | Secure Element access implementation | Daniel Tomas | 2010-11-19 | 4 | -8/+194 |
| | | | | * | | | | | | | Rough first pass at the NFC technology API. | Jeff Hamilton | 2010-11-19 | 16 | -604/+917 |
| | | | | * | | | | | | | Revert "Merge "Remove the My Tag feature." into gingerbread" | Jeff Hamilton | 2010-11-11 | 2 | -0/+44 |
| | * | | | | | | | | | | am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE"... | Xia Wang | 2010-12-02 | 3 | -43/+100 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerb... | Xia Wang | 2010-12-02 | 3 | -43/+100 |
| | | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | Restore Wi-Fi configuration after the test. DO NOT MERGE | Xia Wang | 2010-12-01 | 3 | -43/+100 |
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |