summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-121-1/+1
| | |/ / / / / / / / / /
* | | | | | | | | | | | am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-122-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-122-2/+2
| | |/ / / / / / / / / /
* | | | | | | | | | | | am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-122-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-122-3/+3
| | |/ / / / / / / / / /
* | | | | | | | | | | | am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-125-12/+12
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-125-12/+12
| | |/ / / / / / / / / /
* | | | | | | | | | | | am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-128-19/+13
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-128-19/+13
| | |/ / / / / / / / / /
* | | | | | | | | | | | am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-1272-7/+79
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-1272-7/+79
| | |/ / / / / / / / / /
* | | | | | | | | | | | am 4bbd3cb3: am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in ...Jim Miller2015-02-121-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" in...Jim Miller2015-02-121-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | / / / / / / | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-devJim Miller2015-02-121-5/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-devJim Miller2015-02-121-5/+5
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix accessibility focus bug in statusbarJim Miller2015-02-111-5/+5
* | | | | | | | | | | | am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2015-02-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-devGeoff Mendal2015-02-1219-2/+21
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-1219-2/+21
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWOR...Jeremy Joslin2015-02-121-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-...Jeremy Joslin2015-02-121-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / /
| | * | | | | | | | | am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-devJeremy Joslin2015-02-121-0/+4
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-devJeremy Joslin2015-02-121-0/+4
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Update Javadoc for EXTRA_NETWORK.Jeremy Joslin2015-02-111-0/+4
| | | | |/ / / / / / /
* | | | | | | | | | | am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode in...Benjamin Franz2015-02-121-7/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.Benjamin Franz2015-02-121-7/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am c70d0e71: Fix the javadocs for lock task mode intents.Benjamin Franz2015-02-121-7/+6
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Fix the javadocs for lock task mode intents.Benjamin Franz2015-02-121-7/+6
* | | | | | | | | | | am c7e48719: Merge "Remove references to persist.sys.language/country."Narayan Kamath2015-02-123-20/+4
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am c7e48719: Merge "Remove references to persist.sys.language/country."Narayan Kamath2015-02-123-20/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge "Remove references to persist.sys.language/country."Narayan Kamath2015-02-123-20/+4
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Remove references to persist.sys.language/country.Narayan Kamath2015-02-123-20/+4
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "Remove usages of FloatMath" automerge: a8e8cdbNeil Fuller2015-02-128-45/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Remove usages of FloatMath"Neil Fuller2015-02-128-45/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Remove usages of FloatMath"Neil Fuller2015-02-128-45/+32
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Remove usages of FloatMathNeil Fuller2015-02-128-45/+32
* | | | | | | | | | | | | | resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aospTao Bao2015-02-1178-4923/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am d884c63c: Merge "Use ICU for relative time formatting"Tao Bao2015-02-1278-4923/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "Use ICU for relative time formatting"Tao Bao2015-02-1278-4923/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Use ICU for relative time formattingTao Bao2015-02-1178-4923/+15
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface d...Eino-Ville Talvala2015-02-121-9/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on ...Eino-Ville Talvala2015-02-121-9/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfac...Eino-Ville Talvala2015-02-121-9/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-...Eino-Ville Talvala2015-02-121-9/+3
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Legacy: Only set user surface dimensions on output surfacesEino-Ville Talvala2015-02-111-9/+3
| | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |