summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2013-02-11Merge "Merge commit 'android-4.2.1_r1.2' into merge"M8974AAAAANLYA0050029M8960AAAAANLYA2320M8930AAAAANLYA2540129AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.029AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.028AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.025AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.024AU_LINUX_ANDROID_JB_MR1.04.02.01.49.119AU_LINUX_ANDROID_JB_MR1.04.02.01.49.118AU_LINUX_ANDROID_JB_MR1.04.02.01.49.117AU_LINUX_ANDROID_JB_MR1.04.02.01.49.116AU_LINUX_ANDROID_JB_MR1.04.02.01.49.115AU_LINUX_ANDROID_JB_MR1.04.02.01.49.114AU_LINUX_ANDROID_JB_MR1.04.02.01.49.113AU_LINUX_ANDROID_JB_MR1.04.02.01.49.112AU_LINUX_ANDROID_JB_MR1.04.02.01.49.105AU_LINUX_ANDROID_JB_MR1.04.02.01.49.104AU_LINUX_ANDROID_JB_MR1.04.02.01.49.102AU_LINUX_ANDROID_JB_2.5.04.02.01.40.146AU_LINUX_ANDROID_JB_2.5.04.02.01.40.145AU_LINUX_ANDROID_JB_2.5.04.02.01.40.144AU_LINUX_ANDROID_JB_2.5.04.02.01.40.143AU_LINUX_ANDROID_JB_2.5.04.02.01.40.142AU_LINUX_ANDROID_JB_2.5.04.02.01.40.141AU_LINUX_ANDROID_JB_2.5.04.02.01.40.140AU_LINUX_ANDROID_JB_2.5.04.02.01.40.134AU_LINUX_ANDROID_JB_2.5.04.02.01.40.133AU_LINUX_ANDROID_JB_2.5.04.02.01.40.131AU_LINUX_ANDROID_JB_2.5.04.02.01.40.130AU_LINUX_ANDROID_JB_2.5.04.02.01.40.129AU_LINUX_ANDROID_JB_2.5.04.02.01.40.128A8064AAAAANLYA1912A8064AAAAANLYA161022Linux Build Service Account0-0/+0
2013-02-08Merge commit 'android-4.2.1_r1.2' into mergeJessica Gonzalez0-0/+0
2013-01-26Merge "Update snapshot logic to include sys prop enabled nav bar"M8974AAAAANLYA0050021M8960AAAAANLYA2540092M8960AAAAANLYA106313M8960AAAAANLYA106312M8930AAAAANLYA4020M8930AAAAANLYA3015M8930AAAAANLYA2504127M8930AAAAANLYA17415M8930AAAAANLYA17320AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.023AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.021AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.01.43.026AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.01.43.025AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.01.43.024AU_LINUX_ANDROID_JB_MR1.04.02.01.49.098AU_LINUX_ANDROID_JB_MR1.04.02.01.49.096AU_LINUX_ANDROID_JB_MR1.04.02.01.49.091AU_LINUX_ANDROID_JB_MR1.04.02.01.49.090AU_LINUX_ANDROID_JB_MR1.04.02.01.49.089AU_LINUX_ANDROID_JB_MR1.04.02.01.49.087AU_LINUX_ANDROID_JB_MR1.04.02.01.49.086AU_LINUX_ANDROID_JB_MR1.04.02.01.49.085AU_LINUX_ANDROID_JB_MR1.04.02.01.49.084AU_LINUX_ANDROID_JB_MR1.04.02.01.49.083AU_LINUX_ANDROID_JB_MR1.04.02.01.49.082AU_LINUX_ANDROID_JB_MR1.04.02.01.49.081AU_LINUX_ANDROID_JB_MR1.04.02.01.49.077AU_LINUX_ANDROID_JB_MR1.04.02.01.49.075AU_LINUX_ANDROID_JB_MR1.04.02.01.49.074AU_LINUX_ANDROID_JB_MR1.04.02.01.49.072AU_LINUX_ANDROID_JB_MR1.04.02.01.49.071AU_LINUX_ANDROID_JB_MR1.04.02.01.49.070AU_LINUX_ANDROID_JB_MR1.04.02.01.49.069AU_LINUX_ANDROID_JB_MR1.04.02.01.49.068AU_LINUX_ANDROID_JB_MR1.04.02.01.49.067AU_LINUX_ANDROID_JB_2.5.04.02.01.40.127AU_LINUX_ANDROID_JB_2.5.04.02.01.40.126AU_LINUX_ANDROID_JB_2.5.04.02.01.40.124AU_LINUX_ANDROID_JB_2.5.04.02.01.40.120AU_LINUX_ANDROID_JB_2.5.04.02.01.40.118AU_LINUX_ANDROID_JB_2.5.04.02.01.40.117AU_LINUX_ANDROID_JB_2.5.04.02.01.40.116AU_LINUX_ANDROID_JB_2.5.04.02.01.40.110AU_LINUX_ANDROID_JB_2.5.04.02.01.40.109AU_LINUX_ANDROID_JB_2.5.04.02.01.40.108AU_LINUX_ANDROID_JB_2.5.04.02.01.40.107AU_LINUX_ANDROID_JB_2.5.04.02.01.40.106AU_LINUX_ANDROID_JB_2.5.04.02.01.40.105AU_LINUX_ANDROID_JB_2.5.04.02.01.40.104AU_LINUX_ANDROID_JB_2.5.04.02.01.40.102AU_LINUX_ANDROID_JB_2.5.04.02.01.40.101AU_LINUX_ANDROID_JB_2.5.04.02.01.40.100AU_LINUX_ANDROID_JB_2.5.04.02.01.40.099AU_LINUX_ANDROID_JB_2.5.04.02.01.40.098AU_LINUX_ANDROID_JB_2.5.04.02.01.40.097AU_LINUX_ANDROID_JB_2.5.04.02.01.40.096AU_LINUX_ANDROID_JB_2.5.04.02.01.40.095AU_LINUX_ANDROID_JB_2.5.04.02.01.40.094AU_LINUX_ANDROID_JB_2.5.04.02.01.40.093AU_LINUX_ANDROID_JB_2.5.04.02.01.40.092AU_LINUX_ANDROID_JB_2.5.04.02.01.40.091AU_LINUX_ANDROID_JB_2.5.04.02.01.40.090AU_LINUX_ANDROID_JB_2.5.04.02.01.40.089A8064AAAAANLYA1911A8064AAAAANLYA161021A8064AAAAANLYA161020Linux Build Service Account1-0/+5
2013-01-23Update snapshot logic to include sys prop enabled nav barDavid Ng1-0/+5
2013-01-21Upload empty commitM8960AAAAANLYA106311M8960AAAAANLYA106310AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.018AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.017AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.016AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.023AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.022AU_LINUX_ANDROID_JB_MR1.04.02.01.49.058AU_LINUX_ANDROID_JB_MR1.04.02.00.49.051AU_LINUX_ANDROID_JB_2.5.04.02.01.40.085AU_LINUX_ANDROID_JB_2.5.04.02.00.40.083AU_LINUX_ANDROID_JB_2.5.04.02.00.40.082AU_LINUX_ANDROID_JB_2.5.04.02.00.40.079AU_LINUX_ANDROID_JB_2.5.04.02.00.40.078AU_LINUX_ANDROID_JB_2.5.04.02.00.40.077Linux Build Service Account0-0/+0
2012-12-13Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01android-sdk-support_r11android-cts-4.2_r1android-4.2_r1___android-4.2.1_r1___android-4.2.1_r1.2android-4.2.1_r1.1AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.013AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.012AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.011AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.010AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.008AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.007AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.006AU_LINUX_ANDROID_JB_VANILLA.04.02.00.60.003A8064AAAAANLYA16210A8064AAAAANLYA14111The Android Open Source Project60-313/+17536
2012-10-29merge in jb-mr1-release history after reset to jb-mr1-devandroid-4.2_r1android-4.2.1_r1M8974AAAAANLYA0050014M8974AAAAANLYA0050004M8960AAAAANLYA2304M8960AAAAANLYA2303M8960AAAAANLYA2302M8960AAAAANLYA2301M8960AAAAANLYA106309M8960AAAAANLYA106308M8960AAAAANLYA106307M8960AAAAANLYA106306M8960AAAAANLYA106305M8930AAAAANLYA4003M8930AAAAANLYA2505M8930AAAAANLYA2504M8930AAAAANLYA2503M8930AAAAANLYA2502M8930AAAAANLYA2501M8930AAAAANLYA17304M7630AABBQMLZA40901030M7630AABBQMLZA40901020M7630AABBQMLZA40901010M7630AABBQMLZA40901000AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.015AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.014AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.012AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.011AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.010AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.009AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.008AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.004AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.003AU_LINUX_ANDROID_JB_MR1_RB1.04.02.00.50.002AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.020AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.019AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.018AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.016AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.015AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.014AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.013AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.012AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.010AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.009AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.005AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.004AU_LINUX_ANDROID_JB_MR1_CHOCOLATE.04.02.00.43.003AU_LINUX_ANDROID_JB_MR1.04.02.00.49.041AU_LINUX_ANDROID_JB_MR1.04.02.00.49.040AU_LINUX_ANDROID_JB_MR1.04.02.00.49.038AU_LINUX_ANDROID_JB_MR1.04.02.00.49.033AU_LINUX_ANDROID_JB_MR1.04.02.00.49.020AU_LINUX_ANDROID_JB_MR1.04.02.00.49.019AU_LINUX_ANDROID_JB_MR1.04.02.00.49.018AU_LINUX_ANDROID_JB_MR1.04.02.00.49.017AU_LINUX_ANDROID_JB_MR1.04.02.00.49.016AU_LINUX_ANDROID_JB_MR1.04.02.00.49.015AU_LINUX_ANDROID_JB_MR1.04.02.00.49.014AU_LINUX_ANDROID_JB_MR1.04.02.00.49.012AU_LINUX_ANDROID_JB_MR1.04.02.00.49.008AU_LINUX_ANDROID_JB_MR1.04.02.00.49.007AU_LINUX_ANDROID_JB_2.5.3_RB1.04.02.00.67.003AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.027AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.017AU_LINUX_ANDROID_JB_2.5.3.04.02.00.54.011AU_LINUX_ANDROID_JB_2.5.04.02.00.40.075AU_LINUX_ANDROID_JB_2.5.04.02.00.40.074AU_LINUX_ANDROID_JB_2.5.04.02.00.40.072AU_LINUX_ANDROID_JB_2.5.04.02.00.40.070AU_LINUX_ANDROID_JB_2.5.04.02.00.40.068AU_LINUX_ANDROID_JB_2.5.04.02.00.40.066AU_LINUX_ANDROID_JB_2.5.04.02.00.40.064AU_LINUX_ANDROID_JB_2.5.04.02.00.40.061AU_LINUX_ANDROID_JB_2.5.04.02.00.40.059AU_LINUX_ANDROID_JB_2.5.04.02.00.40.055AU_LINUX_ANDROID_JB_2.5.04.02.00.40.054AU_LINUX_ANDROID_JB_2.5.04.02.00.40.053AU_LINUX_ANDROID_JB_2.5.04.02.00.40.052AU_LINUX_ANDROID_JB_2.5.04.02.00.40.051AU_LINUX_ANDROID_JB_2.5.04.02.00.40.050AU_LINUX_ANDROID_JB_2.5.04.02.00.40.049AU_LINUX_ANDROID_JB_2.5.04.02.00.40.048AU_LINUX_ANDROID_JB_2.5.04.02.00.40.047AU_LINUX_ANDROID_JB_2.5.04.02.00.40.046AU_LINUX_ANDROID_JB_2.5.04.02.00.40.043AU_LINUX_ANDROID_JB_2.5.04.02.00.40.042AU_LINUX_ANDROID_JB_2.5.04.02.00.40.041AU_LINUX_ANDROID_JB_2.5.04.02.00.40.040AU_LINUX_ANDROID_JB_2.5.04.02.00.40.036AU_LINUX_ANDROID_JB_2.5.04.02.00.40.030AU_LINUX_ANDROID_JB_2.5.04.02.00.40.027AU_LINUX_ANDROID_JB_2.5.04.02.00.40.024AU_LINUX_ANDROID_JB_2.5.04.02.00.40.023AU_LINUX_ANDROID_JB_2.5.04.02.00.40.022AU_LINUX_ANDROID_JB_2.5.04.02.00.40.021AU_LINUX_ANDROID_JB_2.5.04.02.00.40.020AU_LINUX_ANDROID_JB_2.5.04.02.00.40.019AU_LINUX_ANDROID_JB_2.5.04.02.00.40.018AU_LINUX_ANDROID_JB_2.5.04.02.00.40.016AU_LINUX_ANDROID_JB_2.5.04.02.00.40.015AU_LINUX_ANDROID_JB_2.5.04.02.00.40.010AU_LINUX_ANDROID_JB_2.5.04.02.00.40.009AU_LINUX_ANDROID_JB_2.5.04.02.00.40.008A8064AAAAANLYA2540008A8064AAAAANLYA1630A8064AAAAANLYA1624A8064AAAAANLYA1623BA8064AAAAANLYA1623A8064AAAAANLYA1622AA8064AAAAANLYA1622A8064AAAAANLYA1621DA8064AAAAANLYA1621CA8064AAAAANLYA161012A8064AAAAANLYA161011A8064AAAAANLYA161010A8064AAAAANLYA14110A8064AAAAANLGA1623AThe Android Automerger0-0/+0
2012-10-25Serialize applying card emulation route.Martijn Coenen1-1/+10
2012-10-25merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-24Hold a wakelock during initialisation.Martijn Coenen1-45/+75
2012-10-23merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-23Delay sending EE-wipe APDUs.Martijn Coenen1-0/+7
2012-10-23merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-23Fix wrong Beam image scaling on sw600 and larger devices.Martijn Coenen1-3/+13
2012-10-22Reset RF field status on SE activation.Martijn Coenen1-0/+5
2012-10-16merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-16Merge "Fix Beam animation for non-owner user." into jb-mr1-devMartijn Coenen3-0/+4
2012-10-16am 547b58f4: Fix tag not deactivating to sleep during reconnect.Evan Chu1-8/+9
2012-10-16am a15b24e9: Check for invalid handle before configuring secure element.Evan Chu2-1/+5
2012-10-16Fix tag not deactivating to sleep during reconnect.Evan Chu1-8/+9
2012-10-16Check for invalid handle before configuring secure element.Evan Chu2-1/+5
2012-10-15Fix Beam animation for non-owner user.Martijn Coenen3-0/+4
2012-10-13merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-12Don't hold a timed wakelock.Martijn Coenen2-6/+3
2012-10-11merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-11am a949c743: Fast-fail SE open if it\'s activated in listen mode.Martijn Coenen8-17/+271
2012-10-11am ae1b16cf: (-s ours) Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO ...Paul Chaisson0-0/+0
2012-10-11Fast-fail SE open if it's activated in listen mode.Martijn Coenen8-17/+271
2012-10-11Use RF_ACTIVATE/DEACTIVATE to generate RF events. (DO NOT MERGE)Paul Chaisson1-1/+44
2012-10-10merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-09merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-09merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-09am accbb8c9: Don\'t return target lost in case of NACK for T2T.Martijn Coenen1-14/+12
2012-10-09Don't return target lost in case of NACK for T2T.Martijn Coenen1-14/+12
2012-10-09Merge "NFC changes for multi-user support." into jb-mr1-devMartijn Coenen8-94/+168
2012-10-08Set EE wipe APDUs for NCI stack.Martijn Coenen1-1/+13
2012-10-08NFC changes for multi-user support.Martijn Coenen8-94/+168
2012-10-07merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-05am 7bb9229c: Merge "Increase default transceive timeout to SE to 30s." into j...Martijn Coenen1-1/+1
2012-10-05am 10dd44d3: NFA_HciAddStaticPipe()\'s parameters changedEvan Chu1-2/+6
2012-10-05Merge "Increase default transceive timeout to SE to 30s." into jb-broadcom-nfcMartijn Coenen1-1/+1
2012-10-05merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-04Increase default transceive timeout to SE to 30s.Martijn Coenen1-1/+1
2012-10-04NFA_HciAddStaticPipe()'s parameters changedEvan Chu1-2/+6
2012-10-04Use RF_ACTIVATE/DEACTIVATE to generate RF events.Paul Chaisson1-1/+44
2012-10-04merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger0-0/+0
2012-10-03Merge "NfcAdapterExtras: add driver name." into jb-mr1-devmike wakerly4-0/+22
2012-10-03am c7d56f7e: Fix locking around power state.Evan Chu3-10/+34
2012-10-03NfcAdapterExtras: add driver name.mike wakerly4-0/+22
2012-10-03Fix locking around power state.Evan Chu3-10/+34