aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 82441e60: Remove unnecessary whitespaceJean Chalard2013-02-111-1/+1
|\ | | | | | | | | | | # Via Jean Chalard * commit '82441e60e242681f2ea0d6e97105f819e3bd5071': Remove unnecessary whitespace
| * Remove unnecessary whitespaceJean Chalard2013-02-111-1/+1
| | | | | | | | | | | | This is a cleanup followup to Id3dc510a Change-Id: Ie64395eb4b6218fd8c73cacddeed2fba1df65d26
* | am b2eac474: Don\'t try to issue delete() commands on missing providerJean Chalard2013-02-111-21/+50
|\| | | | | | | | | | | # Via Jean Chalard * commit 'b2eac474ff82d0dad41991cd0f1ae80a58f01be2': Don't try to issue delete() commands on missing provider
| * Don't try to issue delete() commands on missing providerJean Chalard2013-02-111-21/+50
| | | | | | | | | | Bug: 8173622 Change-Id: Id3dc510ae3535169b5290e87075cb2f433a1f603
* | am a92a97d2: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-110-0/+0
|\| | | | | | | | | | | # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit 'a92a97d2cd0657a36112f525c3e1e719415ad0b3': Import translations. DO NOT MERGE
| * Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-1153-0/+1378
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-02-1153-0/+1378
| | | | | | | | | | | | | | | Change-Id: Ibd74870cf9822bce34f54504972e8f7d52c43036 Auto-generated-cl: translation import
* | | am d3c9ec81: Merge "Close file properly"Kurt Partridge2013-02-111-4/+12
|\| | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit 'd3c9ec8133ae203b10eafc8547cbda51d995a44e': Close file properly
| * | Merge "Close file properly"Kurt Partridge2013-02-111-4/+12
| |\ \ | | |/ | |/|
| | * Close file properlyKurt Partridge2013-02-081-4/+12
| | | | | | | | | | | | Change-Id: Ied55b6a6f1e64bbca558316d8d3d207d7655cf91
* | | Import translations. DO NOT MERGEBaligh Uddin2013-02-1153-0/+1378
| | | | | | | | | | | | | | | Change-Id: If167e26b62d1fa89e672da77fbcde015659e635f Auto-generated-cl: translation import
* | | am 825abc00: Follow up to If933fcad56d81dcc956b6114727e01be9686ee9cKen Wakasa2013-02-101-1/+1
|\| | | | | | | | | | | | | | | | | # Via Ken Wakasa * commit '825abc00f472978b3e99392177cb860c336a1de3': Follow up to If933fcad56d81dcc956b6114727e01be9686ee9c
| * | Follow up to If933fcad56d81dcc956b6114727e01be9686ee9cKen Wakasa2013-02-101-1/+1
| | | | | | | | | | | | | | | Bug: 7405756 Change-Id: I415936db98296cd1d2fe6e4a590375061935ba8a
* | | am 5f5862c9: Merge "Change targetSdkVersion to 17"Tadashi G. Takaoka2013-02-081-1/+1
|\| | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1) * commit '5f5862c9b44b45527a78c85e63b381e770f1bce6': Change targetSdkVersion to 17
| * | Merge "Change targetSdkVersion to 17"Tadashi G. Takaoka2013-02-091-1/+1
| |\ \
| | * | Change targetSdkVersion to 17Tadashi G. Takaoka2013-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 7405756 Change-Id: If933fcad56d81dcc956b6114727e01be9686ee9c
* | | | am af01a65f: Merge "Add keyboard hypotenuse metric to ProximityInfo."Tom Ouyang2013-02-082-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Tom Ouyang (1) * commit 'af01a65f985ca928022ec25172a2c1f4bcad3219': Add keyboard hypotenuse metric to ProximityInfo.
| * | | Merge "Add keyboard hypotenuse metric to ProximityInfo."Tom Ouyang2013-02-092-0/+4
| |\ \ \ | | |/ / | |/| |
| | * | Add keyboard hypotenuse metric to ProximityInfo.Tom Ouyang2013-02-082-0/+4
| | | | | | | | | | | | | | | | Change-Id: If4a23041b460326a579e8b8cab20b5c027441e23
* | | | am 927c2d65: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '927c2d65e8d4e2c419bfa45affca2502c859391e': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-082-4/+4
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-02-082-4/+4
| | | |/ | | |/| | | | | | | | | | | | | Change-Id: I1f4b366714462f2aa084ead58c67f8c82618cff5 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-02-082-4/+4
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I517465f48844921772713e7205ddee9c6c4dcb19 Auto-generated-cl: translation import
* | | | | am b0767dd4: Separate resource file for dictionary pack metadataTadashi G. Takaoka2013-02-082-2/+23
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | # Via Tadashi G. Takaoka * commit 'b0767dd499264c8ab0dcb5ca833a66079524c4b3': Separate resource file for dictionary pack metadata
| * / / Separate resource file for dictionary pack metadataTadashi G. Takaoka2013-02-082-2/+23
| |/ / | | | | | | | | | Change-Id: I770335a25c3db12ec8440c4fcb208ca1d9c1fa32
* | | am 3623ad23: [B14] Implement sending the dictionary list.Jean Chalard2013-02-072-16/+57
|\| | | | | | | | | | | | | | | | | # Via Jean Chalard * commit '3623ad238c3fa76f36cb54de63bd31cf320befb4': [B14] Implement sending the dictionary list.
| * | [B14] Implement sending the dictionary list.Jean Chalard2013-02-062-16/+57
| |/ | | | | | | | | Bug: 7005813 Change-Id: Ic3ef69510d2b385d0d403191b2f701b6527d0166
* | am 73857910: Merge "[B11] Implement reset and passing of the URL to the dict ↵Jean Chalard2013-02-062-1/+28
|\| | | | | | | | | | | | | | | pack" # Via Android (Google) Code Review (1) and Jean Chalard (1) * commit '738579103f112e2781848079235d79e98e65d6be': [B11] Implement reset and passing of the URL to the dict pack
| * Merge "[B11] Implement reset and passing of the URL to the dict pack"Jean Chalard2013-02-072-1/+28
| |\
| | * [B11] Implement reset and passing of the URL to the dict packJean Chalard2013-02-062-1/+28
| | | | | | | | | | | | | | | | | | Bug: 7601410 Bug: 7595195 Change-Id: I78cf04dce7c1e64de6725d32317de288a83bd39d
* | | am 68ed7aa9: Fix a testJean Chalard2013-02-061-1/+1
|\| | | | | | | | | | | | | | | | | # Via Jean Chalard * commit '68ed7aa990a73bbdd20ec539289d6b5351e41441': Fix a test
| * | Fix a testJean Chalard2013-02-061-1/+1
| |/ | | | | | | | | | | | | | | The test is wrong - it checks a struct that contains a string instead of checking the string itself. Bug: 8149360 Change-Id: Ifb93d61f25a64a64e1c1e689de792f27994487b6
* | am afe889a8: Merge "[B9] Pass the client id parameter for dict info requests"Jean Chalard2013-02-052-1/+13
|\| | | | | | | | | | | # Via Android (Google) Code Review (1) and Jean Chalard (1) * commit 'afe889a83d43afe23d22d28a443b051bb115f023': [B9] Pass the client id parameter for dict info requests
| * Merge "[B9] Pass the client id parameter for dict info requests"Jean Chalard2013-02-062-1/+13
| |\
| | * [B9] Pass the client id parameter for dict info requestsJean Chalard2013-02-022-1/+13
| | | | | | | | | | | | | | | Bug: 6789534 Change-Id: Ie3ea75b19ae4da2dea531e0077c58742a9502bc6
* | | am a1008f7c: Merge "Remove android.test.runner from tests app"Tadashi G. Takaoka2013-02-051-2/+2
|\| | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1) * commit 'a1008f7c34b1979b42ff0d34f5918c6d3bdddf96': Remove android.test.runner from tests app
| * | Merge "Remove android.test.runner from tests app"Tadashi G. Takaoka2013-02-061-2/+2
| |\ \
| | * | Remove android.test.runner from tests appTadashi G. Takaoka2013-02-051-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 8132168 Change-Id: I7ed84de27a4436539fca0ca4f0efb5e6448480cb
* | | | am 7165f926: Merge "Refactor LogStatement publishing method"Kurt Partridge2013-02-053-90/+109
|\| | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '7165f926b4304a033c2abae7f93a40156062a1a1': Refactor LogStatement publishing method
| * | | Merge "Refactor LogStatement publishing method"Kurt Partridge2013-02-063-90/+109
| |\ \ \
| | * | | Refactor LogStatement publishing methodKurt Partridge2013-02-053-90/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method in LogUnit for publishing a LogStatement to a JsonWriter doesn't depend on anything in the LogUnit. multi-project commit with Id1d6ff4851148bba0e6b5a1ec6eec2b842d9c707 Change-Id: I323cec239d6ea1cee602c2ecf9b13713791e9283
* | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-02-054-4/+4
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-044-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib58eeaa07f3ef34207612a13065f5f9fef8b2b08 Auto-generated-cl: translation import
* | | | | | am 97135c29: Merge "[Rlog79c] Cleanup of feedback strings and text entry"Kurt Partridge2013-02-053-10/+13
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '97135c29c5b8312211e61691496b17baac652ce1': [Rlog79c] Cleanup of feedback strings and text entry
| * | | | | Merge "[Rlog79c] Cleanup of feedback strings and text entry"Kurt Partridge2013-02-053-10/+13
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | [Rlog79c] Cleanup of feedback strings and text entryKurt Partridge2013-02-043-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I97457ea8033a011c37e5970eb91d1a3273b81e2a
* | | | | | am 104d245b: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '104d245b3f3d75787f3458d4fd0962390965b5f8': Import translations. DO NOT MERGE
| * | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-054-4/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-044-4/+4
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Change-Id: I7e498ee5f83a3d4611fc46f34b0a6f0e19c143e5 Auto-generated-cl: translation import