Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-02-12 | 1 | -1/+1 | |
| | |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | | am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1... | Geoff Mendal | 2015-02-12 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev | Geoff Mendal | 2015-02-12 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-02-12 | 2 | -2/+2 | |
| | |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | | am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1... | Geoff Mendal | 2015-02-12 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev | Geoff Mendal | 2015-02-12 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-02-12 | 2 | -3/+3 | |
| | |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | | am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1... | Geoff Mendal | 2015-02-12 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev | Geoff Mendal | 2015-02-12 | 5 | -12/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-02-12 | 5 | -12/+12 | |
| | |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | | am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1... | Geoff Mendal | 2015-02-12 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev | Geoff Mendal | 2015-02-12 | 8 | -19/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-02-12 | 8 | -19/+13 | |
| | |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | | am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1... | Geoff Mendal | 2015-02-12 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev | Geoff Mendal | 2015-02-12 | 72 | -7/+79 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-02-12 | 72 | -7/+79 | |
| | |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | | am 4bbd3cb3: am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in ... | Jim Miller | 2015-02-12 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" in... | Jim Miller | 2015-02-12 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | / / / / / / | | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev | Jim Miller | 2015-02-12 | 1 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev | Jim Miller | 2015-02-12 | 1 | -5/+5 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | Fix accessibility focus bug in statusbar | Jim Miller | 2015-02-11 | 1 | -5/+5 | |
* | | | | | | | | | | | | am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1... | Geoff Mendal | 2015-02-12 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev | Geoff Mendal | 2015-02-12 | 19 | -2/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-02-12 | 19 | -2/+21 | |
| | | |_|_|/ / / / / / / | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWOR... | Jeremy Joslin | 2015-02-12 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-... | Jeremy Joslin | 2015-02-12 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev | Jeremy Joslin | 2015-02-12 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev | Jeremy Joslin | 2015-02-12 | 1 | -0/+4 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | Update Javadoc for EXTRA_NETWORK. | Jeremy Joslin | 2015-02-11 | 1 | -0/+4 | |
| | | | |/ / / / / / / | ||||||
* | | | | | | | | | | | am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode in... | Benjamin Franz | 2015-02-12 | 1 | -7/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents. | Benjamin Franz | 2015-02-12 | 1 | -7/+6 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | am c70d0e71: Fix the javadocs for lock task mode intents. | Benjamin Franz | 2015-02-12 | 1 | -7/+6 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Fix the javadocs for lock task mode intents. | Benjamin Franz | 2015-02-12 | 1 | -7/+6 | |
* | | | | | | | | | | | am c7e48719: Merge "Remove references to persist.sys.language/country." | Narayan Kamath | 2015-02-12 | 3 | -20/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | am c7e48719: Merge "Remove references to persist.sys.language/country." | Narayan Kamath | 2015-02-12 | 3 | -20/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge "Remove references to persist.sys.language/country." | Narayan Kamath | 2015-02-12 | 3 | -20/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Remove references to persist.sys.language/country. | Narayan Kamath | 2015-02-12 | 3 | -20/+4 | |
| | |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge "Remove usages of FloatMath" automerge: a8e8cdb | Neil Fuller | 2015-02-12 | 8 | -45/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge "Remove usages of FloatMath" | Neil Fuller | 2015-02-12 | 8 | -45/+32 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "Remove usages of FloatMath" | Neil Fuller | 2015-02-12 | 8 | -45/+32 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Remove usages of FloatMath | Neil Fuller | 2015-02-12 | 8 | -45/+32 | |
* | | | | | | | | | | | | | | resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp | Tao Bao | 2015-02-11 | 78 | -4923/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am d884c63c: Merge "Use ICU for relative time formatting" | Tao Bao | 2015-02-12 | 78 | -4923/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge "Use ICU for relative time formatting" | Tao Bao | 2015-02-12 | 78 | -4923/+15 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | Use ICU for relative time formatting | Tao Bao | 2015-02-11 | 78 | -4923/+15 | |
| | |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface d... | Eino-Ville Talvala | 2015-02-12 | 1 | -9/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on ... | Eino-Ville Talvala | 2015-02-12 | 1 | -9/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfac... | Eino-Ville Talvala | 2015-02-12 | 1 | -9/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-... | Eino-Ville Talvala | 2015-02-12 | 1 | -9/+3 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Legacy: Only set user surface dimensions on output surfaces | Eino-Ville Talvala | 2015-02-11 | 1 | -9/+3 | |
| | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | | |