summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in lmp-release history after reset to 6ad966292d7d8871f0def607944ecca0a...staging/cm-12.0-cafThe Android Automerger2014-10-210-0/+0
|\
| * merge in lmp-release history after reset to 6ad966292d7d8871f0def607944ecca0a...The Android Automerger2014-10-210-0/+0
|/|
| * merge in lmp-release history after reset to 6ad966292d7d8871f0def607944ecca0a...The Android Automerger2014-10-190-0/+0
|/|
| * merge in lmp-release history after reset to 6ad966292d7d8871f0def607944ecca0a...The Android Automerger2014-10-160-0/+0
|/|
| * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-10-150-0/+0
| |\
| | * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-10-140-0/+0
| |/|
| | * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-10-130-0/+0
| |/|
| | * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-10-120-0/+0
| |/|
| | * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-10-090-0/+0
| |/|
| | * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-10-080-0/+0
| |/|
| | * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-10-070-0/+0
| |/|
| | * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-10-060-0/+0
| |/|
| | * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-10-050-0/+0
| |/|
| | * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-10-010-0/+0
| |/|
| | * merge in lmp-release history after reset to 168c9e90c44a63bd999b5256db7fe8f1b...The Android Automerger2014-09-300-0/+0
| |/|
| | * merge in lmp-release history after reset to 132a0ec74230579a319298e37036e798f...The Android Automerger2014-09-290-0/+0
| | |\
| | | * merge in lmp-release history after reset to 132a0ec74230579a319298e37036e798f...The Android Automerger2014-09-280-0/+0
| | |/|
| | | * merge in lmp-release history after reset to 132a0ec74230579a319298e37036e798f...The Android Automerger2014-09-250-0/+0
| | |/|
| | | * merge in lmp-release history after reset to 132a0ec74230579a319298e37036e798f...The Android Automerger2014-09-240-0/+0
| | |/|
| | | * merge in lmp-release history after reset to 132a0ec74230579a319298e37036e798f...The Android Automerger2014-09-230-0/+0
| | |/|
| | | * merge in lmp-release history after reset to 132a0ec74230579a319298e37036e798f...The Android Automerger2014-09-220-0/+0
| | |/|
| | | * merge in lmp-release history after reset to 132a0ec74230579a319298e37036e798f...The Android Automerger2014-09-210-0/+0
| | |/|
| | | * merge in lmp-release history after reset to c3b32a0c9c18ecb08e60a56ea909781ae...The Android Automerger2014-09-200-0/+0
| | | |\
| | | | * merge in lmp-release history after reset to 132a0ec74230579a319298e37036e798f...The Android Automerger2014-09-200-0/+0
| | | |/| | | |/|/
| | | * merge in lmp-release history after reset to 132a0ec74230579a319298e37036e798f...The Android Automerger2014-09-180-0/+0
| | |/|
| | | * merge in lmp-release history after reset to 132a0ec74230579a319298e37036e798f...The Android Automerger2014-09-170-0/+0
| | |/|
| | | * merge in lmp-release history after reset to 5ecb5a82857217edc17181210a980a705...The Android Automerger2014-09-160-0/+0
| | | |\
| | | | * merge in lmp-release history after reset to 5ecb5a82857217edc17181210a980a705...The Android Automerger2014-09-150-0/+0
| | | |/|
| | | | * merge in lmp-release history after reset to 5ecb5a82857217edc17181210a980a705...The Android Automerger2014-09-140-0/+0
| | | |/|
| | | | * merge in lmp-release history after reset to a9aa6ae4433635edbb4a1dd4304bcaac0...The Android Automerger2014-09-130-0/+0
| | | | |\ | | | | |/ | | | |/|
* | | / | Check access before creating thumbnailMarco Nelissen2014-10-141-3/+9
|/ / / /
* / / / Import translations. DO NOT MERGEBaligh Uddin2014-09-291-1/+1
|/ / /
* / / Import translations. DO NOT MERGEBaligh Uddin2014-09-141-1/+1
|/ /
* / Revert "RingtonePicker: use a non-intercepted stream for playback."Hyejin Kim2014-09-111-3/+0
|/
* Update material colorsAlan Viverette2014-08-251-1/+1
* am cac375e6: (-s ours) am d6291f34: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-08-160-0/+0
|\
| * am d6291f34: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-08-150-0/+0
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-08-151-1/+1
* | | Use material alert dialog item view layoutAdam Powell2014-08-111-1/+1
* | | Update branding colorsAlan Viverette2014-08-061-1/+1
* | | Merge "RingtonePicker: use a non-intercepted stream for playback." into lmp-devJohn Spurlock2014-07-171-0/+3
|\ \ \
| * | | RingtonePicker: use a non-intercepted stream for playback.John Spurlock2014-07-201-0/+3
* | | | De-holo ringtone picker in MediaProvider.John Spurlock2014-07-202-1/+27
|/ / /
* | | Remove deprecated locales - DO NOT MERGEBaligh Uddin2014-07-193-100/+0
* | | Import translations. DO NOT MERGEBaligh Uddin2014-07-161-1/+1
* | | Import translations. DO NOT MERGEBaligh Uddin2014-07-061-0/+35
* | | Import translations. DO NOT MERGEBaligh Uddin2014-06-301-0/+35
* | | fix npe in MediaProviderNick Kralevich2014-05-271-1/+1
* | | am 4c546b54: am 501b93fb: am 17750fdd: Merge "Clean up cursors in try/finally"Marco Nelissen2014-05-161-188/+196
|\| |
| * | am 501b93fb: am 17750fdd: Merge "Clean up cursors in try/finally"Marco Nelissen2014-05-161-188/+196
| |\ \