aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-devQiwen Zhao2015-07-133-3/+78
|\
| * resolved conflicts for merge of d711426a to mnc-dr-dev•••Change-Id: I2113be7af0f4abe0816c6985b394a73395206c2d Jatin Matani2015-07-133-3/+78
| |\
| | * Remove android.util.Log from FileUtils•••FileUtils is being used for other non android projects and hence breaks when built. Instead use the log statements at caller to record Log.e messages. Hence there is no side effect here. Bug:22042371 Change-Id: Ieb100006ff38e013bc30542637465f58bfc0f2f2 Jatin Matani2015-07-093-10/+9
* | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-1144-336/+335
|\ \ \
| * | | Import translations. DO NOT MERGE•••Change-Id: Idbbfc3e5aa4f2f55e848e117da6f6b553323b971 Auto-generated-cl: translation import Geoff Mendal2015-07-1144-336/+335
| |/ /
* | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-114-4/+4
|\ \ \
| * | | Import translations. DO NOT MERGE•••Change-Id: I8686627b551188696543ab94fff742a02e6e27cc Auto-generated-cl: translation import Geoff Mendal2015-07-114-4/+4
| |/ /
* | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-112-2/+2
|\ \ \
| * | | Import translations. DO NOT MERGE•••Change-Id: Iaee7e2521801ec3fd3b7856b6aded0d0980f4ea7 Auto-generated-cl: translation import Geoff Mendal2015-07-112-2/+2
| |/ /
* / / Import translations. DO NOT MERGE•••Change-Id: I144d565ab22039cb3af19760ae2fde169729cfe5 Auto-generated-cl: translation import Geoff Mendal2015-07-112-3/+3
|/ /
* | am 8c2591ee: Bring back shortcuts and add to dictionary UI•••* commit '8c2591eec80dbe44158b1613cd96056057a41139': Bring back shortcuts and add to dictionary UI Jatin Matani2015-07-117-62/+466
|\|
| * Bring back shortcuts and add to dictionary UI•••For JB and lower devices, the UI is surfaced by the IME. Bug: 22200135 Change-Id: Icca08500ee0683e2ceb5357b0bc430cd1712220e Jatin Matani2015-07-067-62/+466
* | Revert reset to ub-latinimegoogle-fava-releaseBaligh Uddin2015-07-010-0/+0
|\ \
| * \ keep history after reset to ub-latinimegoogle-fava-releaseBaligh Uddin2015-07-010-0/+0
| |\ \ | |/ / |/| |
* | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-312-9/+9
|\ \ \
| * | | Import translations. DO NOT MERGE•••Change-Id: I818a58b2205a45a3ff19248acebe9e7141eac24c Auto-generated-cl: translation import Geoff Mendal2015-05-302-9/+9
* | | | Import translations. DO NOT MERGE•••Change-Id: Iaa49902baab0352eb4d6a76495cbc3ea9efcd336 Auto-generated-cl: translation import Geoff Mendal2015-05-301-1/+1
|/ / /
* | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-142-3/+3
|\ \ \
| * | | Import translations. DO NOT MERGE•••Change-Id: I48f032dc490abd64459f7a0afcdd564807c5c3ae Auto-generated-cl: translation import Geoff Mendal2015-05-132-3/+3
* | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-141-3/+3
|\ \ \ \
| * | | | Import translations. DO NOT MERGE•••Change-Id: Ibfbf17225e965703b97e6f21ade5c70442f077f0 Auto-generated-cl: translation import Geoff Mendal2015-05-131-3/+3
| |/ / /
* | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-05-141-179/+179
|\ \ \ \
| * | | | Import translations. DO NOT MERGE•••Change-Id: I2e11fbb3d7a07932b5aa224dbce0f990571e5fda Auto-generated-cl: translation import Geoff Mendal2015-05-131-179/+179
| |/ / /
* / / / Import translations. DO NOT MERGE•••Change-Id: I873ea76f10bb8636e78a595099d94fa1a850afe7 Auto-generated-cl: translation import Geoff Mendal2015-05-132-23/+23
|/ / /
* | | Import translations. DO NOT MERGE•••Change-Id: I0d89c976107040d79695ea31b6d1c4a3db6ea81d Auto-generated-cl: translation import Geoff Mendal2015-05-132-31/+31
| * | merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-250-0/+0
| |\ \ | | |/ | |/|
| | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-250-0/+0
| | |\
| | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-250-0/+0
| | | |\
| | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-240-0/+0
| | | | |\
| | | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-240-0/+0
| | | | | |\
| | | | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-230-0/+0
| | | | | | |\
| | | | | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-230-0/+0
| | | | | | | |\
| | | | | | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-220-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-200-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-200-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-180-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-170-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Import translations. DO NOT MERGE•••Change-Id: I786b2ed5ad54c7a3943c33d10186944a5542d5f6 Auto-generated-cl: translation import Geoff Mendal2015-06-173-0/+636
| | | | | | | | | | | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-170-0/+0
| | | | | | | | | | | | |/|
| | | | | | | | | | | | | * merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinime...The Android Automerger2015-06-160-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-fava-releaseGeoff Mendal2015-06-163-0/+636
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Import translations. DO NOT MERGE•••Change-Id: I90e1f481c08a2a4837e4bb91099f1b6544478a3f Auto-generated-cl: translation import Geoff Mendal2015-06-163-0/+636
| | | | | | | | | | | | | | * | Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-fava-releaseGeoff Mendal2015-06-166-5/+275
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * | Import translations. DO NOT MERGE•••Change-Id: Ic1b75b4b9f4883a65a6af30e8107c19776bf6156 Auto-generated-cl: translation import Geoff Mendal2015-06-166-5/+275
| | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | * | Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-fava-releaseGeoff Mendal2015-06-166-32/+864
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * | Import translations. DO NOT MERGE•••Change-Id: Id61651934454c2465a6062e325fa412b2d075c6e Auto-generated-cl: translation import Geoff Mendal2015-06-166-32/+864
| | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | * | Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-fava-releaseGeoff Mendal2015-06-1612-46/+3450
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * | Import translations. DO NOT MERGE•••Change-Id: I949528b29248aade27b2793eb66b30ef3cb704cc Auto-generated-cl: translation import Geoff Mendal2015-06-1612-46/+3450
| | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | * | Merge "Import translations. DO NOT MERGE" into ub-latinimegoogle-fava-releaseGeoff Mendal2015-06-166-2/+98
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * | Import translations. DO NOT MERGE•••Change-Id: I1e0a5acbb3541486506bf03f4a3859b8c26039cd Auto-generated-cl: translation import Geoff Mendal2015-06-166-2/+98
| | | | | | | | | | | | | | | |/