Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix merge relicts.staging/cm-12.1-test | Danny Baumann | 2015-03-25 | 1 | -34/+0 |
* | Fix parameter naming. | Danny Baumann | 2015-03-25 | 1 | -4/+4 |
* | Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platf... | Steve Kondik | 2015-03-25 | 134 | -5372/+4360 |
|\ | |||||
| * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-02-09 | 0 | -0/+0 |
| |\ | |||||
| | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-02-05 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-26 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-19 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-13 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-12 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-30 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-24 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-22 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-11 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-10 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-09 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-08 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-04 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * | Set content inset end to 0. | Andrew Lee | 2014-12-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-03 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-02 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-12-01 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-24 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-20 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | * | Move ToneGenerator recreation/release to onStart/onStop | Yorke Lee | 2014-11-17 | 1 | -20/+29 |
| | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-17 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-13 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-12 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-11 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-10 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 99d00ab018325ebfa86206e847d48... | The Android Automerger | 2014-11-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |/|/ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to e6b0084dde5ae729584095cfe17bb... | The Android Automerger | 2014-11-06 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 5e0499f20ca5b29bd09838f19bacf... | The Android Automerger | 2014-11-05 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to ac0b6dfffe08e027eac03973f99fd... | The Android Automerger | 2014-11-04 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 272b84b3ef3d948ba1c9703b39525... | The Android Automerger | 2014-11-03 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 272b84b3ef3d948ba1c9703b39525... | The Android Automerger | 2014-11-02 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 272b84b3ef3d948ba1c9703b39525... | The Android Automerger | 2014-11-01 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 35741bb2f60cf438595950d08d078... | The Android Automerger | 2014-10-30 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 8265c1eb4d2c3fc627cded0bbbee5... | The Android Automerger | 2014-10-29 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 076e9841dc30866e802ac9142fa2f... | The Android Automerger | 2014-10-28 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to e5e1483618bbab3d44885c5a5956f... | The Android Automerger | 2014-10-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to e5e1483618bbab3d44885c5a5956f... | The Android Automerger | 2014-10-26 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to f1621a2f2d43a28b9a98b6e75bc13... | The Android Automerger | 2014-10-25 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 11d2c3b284d7e53d76af708be5fda... | The Android Automerger | 2014-10-23 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 844b1532be89e413d2908ea8d2656... | The Android Automerger | 2014-10-22 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 844b1532be89e413d2908ea8d2656... | The Android Automerger | 2014-10-21 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/| | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 18dc46e593caa21f061f00d6848b6... | The Android Automerger | 2014-10-20 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to 175ba74cb4e6c76e6c703e2855a8d... | The Android Automerger | 2014-10-19 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ |