summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* NFCService: Add sysprop to prevent FW download during boot with NFC off.stable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1ITony Layher2015-02-151-1/+12
* Automatic translation importMichael Bestas2015-02-104-0/+158
* Revert "nfc jni: allow bypassing of switching power states"Tony Layher2015-01-202-11/+1
* nfc jni: allow bypassing of switching power statessjefdeklerk2014-12-272-1/+11
* merge in lmp-release history after reset to 5443a8f5b786bfc03633ea5821d95dffc...staging/cm-12.0-cafThe Android Automerger2014-10-210-0/+0
|\
| * merge in lmp-release history after reset to 5443a8f5b786bfc03633ea5821d95dffc...The Android Automerger2014-10-210-0/+0
|/|
| * merge in lmp-release history after reset to 672cb7036e219e260ba97f025c70e5972...The Android Automerger2014-10-190-0/+0
| |\
| | * merge in lmp-release history after reset to 672cb7036e219e260ba97f025c70e5972...The Android Automerger2014-10-160-0/+0
| |/|
| | * merge in lmp-release history after reset to 672cb7036e219e260ba97f025c70e5972...The Android Automerger2014-10-150-0/+0
| |/|
| | * merge in lmp-release history after reset to b58a7494a893c957a8c04397eb28a4bf2...The Android Automerger2014-10-140-0/+0
| | |\
| | | * merge in lmp-release history after reset to b58a7494a893c957a8c04397eb28a4bf2...The Android Automerger2014-10-130-0/+0
| | |/|
| | | * merge in lmp-release history after reset to b58a7494a893c957a8c04397eb28a4bf2...The Android Automerger2014-10-120-0/+0
| | |/|
| | | * Disable service cache debug.Martijn Coenen2014-10-101-1/+1
| | | * merge in lmp-release history after reset to 1ed9fb37431002d39d9e34c6a73b3d039...The Android Automerger2014-10-090-0/+0
| | | |\
| | | | * merge in lmp-release history after reset to d010a97424d26b759bfdea1f54d389640...The Android Automerger2014-10-080-0/+0
| | | | |\
| | | | | * merge in lmp-release history after reset to d010a97424d26b759bfdea1f54d389640...The Android Automerger2014-10-070-0/+0
| | | | |/|
| | | | | * merge in lmp-release history after reset to 906c1c6e106a675f0c9c870d8886e34a4...The Android Automerger2014-10-060-0/+0
| | | | | |\
| | | | | | * merge in lmp-release history after reset to 906c1c6e106a675f0c9c870d8886e34a4...The Android Automerger2014-10-050-0/+0
| | | | | |/|
| | | | | | * merge in lmp-release history after reset to 906c1c6e106a675f0c9c870d8886e34a4...The Android Automerger2014-10-010-0/+0
| | | | | |/|
| | | | | | * merge in lmp-release history after reset to 906c1c6e106a675f0c9c870d8886e34a4...The Android Automerger2014-09-300-0/+0
| | | | | |/|
| | | | | | * merge in lmp-release history after reset to 2e1b401f763d13b81f9a31e036706c6b5...The Android Automerger2014-09-290-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-release history after reset to 2e1b401f763d13b81f9a31e036706c6b5...The Android Automerger2014-09-280-0/+0
| | | | | | |/|
| | | | | | | * merge in lmp-release history after reset to f863f79a6f8f60a444bdebb69a6e07f48...The Android Automerger2014-09-250-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-release history after reset to f863f79a6f8f60a444bdebb69a6e07f48...The Android Automerger2014-09-240-0/+0
| | | | | | | |/|
| | | | | | | | * merge in lmp-release history after reset to bb6da4601c6e106f00b6525d2241ad785...The Android Automerger2014-09-230-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-release history after reset to bb6da4601c6e106f00b6525d2241ad785...The Android Automerger2014-09-220-0/+0
| | | | | | | | |/|
| | | | | | | | | * merge in lmp-release history after reset to bb6da4601c6e106f00b6525d2241ad785...The Android Automerger2014-09-210-0/+0
| | | | | | | | |/|
| | | | | | | | | * merge in lmp-release history after reset to 0b9b4c3c8d4dc6698a1a3e72de1d60731...The Android Automerger2014-09-200-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-release history after reset to bb6da4601c6e106f00b6525d2241ad785...The Android Automerger2014-09-200-0/+0
| | | | | | | | | |/| | | | | | | | | |/|/
| | | | | | | | | * merge in lmp-release history after reset to b5370c0665c2d202891c22dc43cf719e6...The Android Automerger2014-09-180-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-release history after reset to b5370c0665c2d202891c22dc43cf719e6...The Android Automerger2014-09-170-0/+0
| | | | | | | | | |/|
| | | | | | | | | | * merge in lmp-release history after reset to e276d3323d755d8bdaccd59a551332c06...The Android Automerger2014-09-160-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-release history after reset to 71bb7dc44204a93a6ec7136089449e1e5...The Android Automerger2014-09-150-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-release history after reset to 71bb7dc44204a93a6ec7136089449e1e5...The Android Automerger2014-09-140-0/+0
| | | | | | | | | | | |/|
| | | | | | | | | | | | * merge in lmp-release history after reset to fad6422bdd299ec497c86475cc5224738...The Android Automerger2014-09-130-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in lmp-release history after reset to 71bb7dc44204a93a6ec7136089449e1e5...The Android Automerger2014-09-130-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | |/|/
| | | | | | | | | | | | * merge in lmp-release history after reset to 4db692d187951b1e9b92d5609509ad2fb...The Android Automerger2014-09-110-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in lmp-release history after reset to cf76dfbf36ab621b9372527ddc8ca605e...The Android Automerger2014-09-100-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in lmp-release history after reset to cf76dfbf36ab621b9372527ddc8ca605e...The Android Automerger2014-09-090-0/+0
| | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | * merge in lmp-release history after reset to d0393d4d0f421623fb52328fda5ab6a3d...The Android Automerger2014-09-080-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in lmp-release history after reset to d0393d4d0f421623fb52328fda5ab6a3d...The Android Automerger2014-09-070-0/+0
| | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | * merge in lmp-release history after reset to 95c1a0d764a22cff5598354d3af763693...The Android Automerger2014-09-060-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in lmp-release history after reset to d0393d4d0f421623fb52328fda5ab6a3d...The Android Automerger2014-09-060-0/+0
| | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | |/|/
| | | | | | | | | | | | | | | * merge in lmp-release history after reset to 97c433e213ed7ccdbac300da7577fbb9d...The Android Automerger2014-09-040-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in lmp-release history after reset to 77dca761e63e9fed368500e0e1cc0f153...The Android Automerger2014-09-030-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to 77dca761e63e9fed368500e0e1cc0f153...The Android Automerger2014-09-020-0/+0
| | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to b1c148f8e48c70a0839a08df51091da91...The Android Automerger2014-09-010-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to b1c148f8e48c70a0839a08df51091da91...The Android Automerger2014-08-310-0/+0
| | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to bdd6b46cf24eb1da94262d4d1637d9c6f...The Android Automerger2014-08-270-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in lmp-release history after reset to 3737ca4b489495f6b0085ace41c7c8fd7...The Android Automerger2014-08-260-0/+0
| | | | | | | | | | | | | | | | | | | |\