aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | 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
* | | | | | | | | | am df1b8d5e: Merge "Add unit tests tags"Tadashi G. Takaoka2013-02-0427-27/+70
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1) * commit 'df1b8d5eec1909a7ff000825e20e1e45d6f39297': Add unit tests tags
| * | | | | | | | | Merge "Add unit tests tags"Tadashi G. Takaoka2013-02-0527-27/+70
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add unit tests tagsTadashi G. Takaoka2013-02-0427-27/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8131968 Change-Id: Ibca5a0d63a492134b8af401a62ca3a5748e003cf
* | | | | | | | | | | am 298b4240: Separate IntentUtils from CompatUtilsTadashi G. Takaoka2013-02-044-22/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Tadashi G. Takaoka * commit '298b4240f84344bbcd70b72dfb20806ba93ffd22': Separate IntentUtils from CompatUtils
| * | | | | | | | | | Separate IntentUtils from CompatUtilsTadashi G. Takaoka2013-02-044-22/+49
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I373ae7ad26eee44cc8e9720314f6a53b811d0021
* | | | | | | | | | am 70c63049: Make CHAR LIMIT to 66 for some stringsTadashi G. Takaoka2013-02-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Tadashi G. Takaoka * commit '70c63049d3635220ccda6923b3333c5e72451192': Make CHAR LIMIT to 66 for some strings
| * | | | | | | | | Make CHAR LIMIT to 66 for some stringsTadashi G. Takaoka2013-02-041-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8112520 Change-Id: Ia7303e9bae651a3990b781341002fae950997dc1
* | | | | | | | | am 445d8e8b: Merge "[Rlog79b] Save channel name during internal use"Kurt Partridge2013-02-042-6/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '445d8e8bf633dbec64e7e0833384777bee137ebf': [Rlog79b] Save channel name during internal use
| * | | | | | | | Merge "[Rlog79b] Save channel name during internal use"Kurt Partridge2013-02-042-6/+33
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [Rlog79b] Save channel name during internal useKurt Partridge2013-02-042-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feedback string is used as a channel name in internal builds. Add a flag that lets it be saved between calls to make it easier to generate test data. Change-Id: I5c6149b1e68239cd968b6852d03cc240ddde99ca
* | | | | | | | | | am 5ca4afa5: Merge "[Rlog48c] Replay historical motion data"Kurt Partridge2013-02-043-21/+421
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '5ca4afa543a8ce8ba82d84e393a577de306582b3': [Rlog48c] Replay historical motion data
| * | | | | | | | | Merge "[Rlog48c] Replay historical motion data"Kurt Partridge2013-02-043-21/+421
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [Rlog48c] Replay historical motion dataKurt Partridge2013-02-043-21/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib398ea61ff048b1a4ac3b7f7b4a772e173a7b294
* | | | | | | | | | | am 82b4374c: Merge "[Rlog48b] Better visual indicator for logging state"Kurt Partridge2013-02-042-3/+23
|\| | | | | | | | | | | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '82b4374c75ba64dd736b9509f27389a38b92c8ed': [Rlog48b] Better visual indicator for logging state
| * | | | | | | | | Merge "[Rlog48b] Better visual indicator for logging state"Kurt Partridge2013-02-042-3/+23
| |\| | | | | | | | | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | [Rlog48b] Better visual indicator for logging stateKurt Partridge2013-02-012-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now applies yellow bars if recording, green bars if replaying. Change-Id: I39d39de6254fd57107ea5355c43b154244520985
* | | | | | | | | am f1acb0e5: Make some strings privateJean Chalard2013-02-021-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Jean Chalard * commit 'f1acb0e52d2a104861cc2ee4cc3adcb9e0a81f3b': Make some strings private
| * | | | | | | | Make some strings privateJean Chalard2013-02-021-5/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ffdbcf6bede86a3cdcb3a0e4ec263398502617c
* | | | | | | | am 44219ff2: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-010-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Baligh Uddin (1) * commit '44219ff28fd4eb0029ef8c438ae2ff4b3f36e3fc': Import translations. DO NOT MERGE
| * | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-0138-158/+86
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-0138-158/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I385b565d8b768795e2917cb3726dae8cbb7d3ebd Auto-generated-cl: translation import
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-02-0138-158/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-0138-158/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2aa005657ac474635219de81758b71c39e6d9ff Auto-generated-cl: translation import
* | | | | | | | | | am ceffa0be: Merge "[Rlog79a] Disallow empty feedback messages"Kurt Partridge2013-02-012-6/+17
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit 'ceffa0bec97f3b819dbd4eb37f53b6eac3db2b07': [Rlog79a] Disallow empty feedback messages
| * | | | | | | | | Merge "[Rlog79a] Disallow empty feedback messages"Kurt Partridge2013-02-012-6/+17
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | [Rlog79a] Disallow empty feedback messagesKurt Partridge2013-02-012-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30f7c07606e466c3c9538adad94024d00f0901de
* | | | | | | | | | am 0cafd658: Merge "[Rlog48a] Update and make logging strings consistent"Kurt Partridge2013-02-014-13/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '0cafd6580c05de2b718652cdced8e7072efa3a21': [Rlog48a] Update and make logging strings consistent
| * | | | | | | | | Merge "[Rlog48a] Update and make logging strings consistent"Kurt Partridge2013-02-014-13/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | [Rlog48a] Update and make logging strings consistentKurt Partridge2013-01-314-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iae04115921aaf6bbc3c6ad6e7d2d0e7401af41f8
* | | | | | | | | | | am 5bdd7bab: Merge "[Rlog47] Replayer service, inspect-researchLog.py"Kurt Partridge2013-02-014-12/+94
|\| | | | | | | | | | | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Android (Google) Code Review (1) and Kurt Partridge (1) * commit '5bdd7bab11cee1be86d8ab3e2167059eb9d682e2': [Rlog47] Replayer service, inspect-researchLog.py
| * | | | | | | | | Merge "[Rlog47] Replayer service, inspect-researchLog.py"Kurt Partridge2013-02-014-12/+94
| |\| | | | | | | | | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | [Rlog47] Replayer service, inspect-researchLog.pyKurt Partridge2013-01-314-12/+94
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-project commit with Ia2dd81afb4ea124094a20a39e31ffd193edff3d2 Change-Id: I80fe8f2ce137fedf48038955d5f3d9deed04f763
* | | | | | | | am ee456af9: Cleanup in ProximityInfoParamsKen Wakasa2013-02-014-13/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Via Ken Wakasa * commit 'ee456af9d4c7ce4fe2dc0513a8b2cf08c21b5f21': Cleanup in ProximityInfoParams
| * | | | | | | Cleanup in ProximityInfoParamsKen Wakasa2013-02-014-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4302e3cb2470cee32f9ac2f04e0837fff67ce0cd