Jean Chalard
228674f6c7
Merge "fix findWordInTree." into jb-mr1-dev
2012-08-16 18:54:24 -07:00
Yuichiro Hanada
0d35c159fe
fix findWordInTree.
...
Change-Id: I8f42df28f76188677db9d4e55885e1fc6a40b53f
2012-08-17 10:23:01 +09:00
Jean Chalard
7d6a211702
am 0d2cece0: am 3083b4b7: Merge "Fix a debug method" into jb-mr1-dev
...
* commit '0d2cece02d3bdafa54d3dcf5abf344a71f3a5eaa':
Fix a debug method
2012-08-16 18:02:33 -07:00
Jean Chalard
0d2cece02d
am 3083b4b7: Merge "Fix a debug method" into jb-mr1-dev
...
* commit '3083b4b77d51b28749a819d4e01a09ec558956e4':
Fix a debug method
2012-08-16 18:00:28 -07:00
Jean Chalard
3083b4b77d
Merge "Fix a debug method" into jb-mr1-dev
2012-08-16 17:59:11 -07:00
Jean Chalard
cc1062cfd0
Fix a debug method
...
Change-Id: Icf78fb0d5f7caea78f053fffd1ecd4289629964a
2012-08-17 09:24:45 +09:00
Baligh Uddin
418e22c223
am cd4c6c4d: (-s ours) am a07590a8: Import translations. DO NOT MERGE
...
* commit 'cd4c6c4d2114a069f7e49dfaa854baef9916c2e4':
Import translations. DO NOT MERGE
2012-08-16 15:26:10 -07:00
Baligh Uddin
cd4c6c4d21
am a07590a8: Import translations. DO NOT MERGE
...
* commit 'a07590a81c270c5843237f8edb4f58f6f4fabd8a':
Import translations. DO NOT MERGE
2012-08-16 15:23:58 -07:00
Baligh Uddin
a734727967
Import translations. DO NOT MERGE
...
Change-Id: If62326777fb4a3c9596135cf07bc1361330ee849
Auto-generated-cl: translation import
2012-08-16 15:22:06 -07:00
Baligh Uddin
a07590a81c
Import translations. DO NOT MERGE
...
Change-Id: I5d02e55780596d25356a602027f3c41913057810
Auto-generated-cl: translation import
2012-08-16 15:17:17 -07:00
The Android Automerger
36b871ae0c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-16 06:34:44 -07:00
Ken Wakasa
edfe6c4d14
am 5b0c0e55: am bc44ad77: Merge "fix findWordInTree." into jb-mr1-dev
...
* commit '5b0c0e5519918d52db72f522336080ed8e9311b0':
fix findWordInTree.
2012-08-16 05:08:42 -07:00
Ken Wakasa
5b0c0e5519
am bc44ad77: Merge "fix findWordInTree." into jb-mr1-dev
...
* commit 'bc44ad77e50a9f5ca2dab2c5153971b23c33fa2c':
fix findWordInTree.
2012-08-16 04:59:05 -07:00
Ken Wakasa
bc44ad77e5
Merge "fix findWordInTree." into jb-mr1-dev
2012-08-16 04:26:55 -07:00
Yuichiro Hanada
66f338983b
fix findWordInTree.
...
Change-Id: I9d81c815494a0670afa81219ad7bad82274d997e
2012-08-16 20:21:47 +09:00
Ken Wakasa
39a2cee68d
am 0acb1326: am fee0ac60: Cleanup and fix method visibility.
...
* commit '0acb13266988c1c582f1ce2ba26252e76702b607':
Cleanup and fix method visibility.
2012-08-16 03:56:10 -07:00
Ken Wakasa
0acb132669
am fee0ac60: Cleanup and fix method visibility.
...
* commit 'fee0ac60b1cd0a4760ca8f310ff8a86b925d833b':
Cleanup and fix method visibility.
2012-08-16 03:54:22 -07:00
Ken Wakasa
fee0ac60b1
Cleanup and fix method visibility.
...
Change-Id: Ia9e8c69da21ce22bf674ec6c7b2536008a360ea3
2012-08-16 19:34:02 +09:00
The Android Open Source Project
be2f9632b8
am 73946166: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '73946166007738852836243276d1f9041912dd89':
2012-08-15 08:32:31 -07:00
The Android Open Source Project
7394616600
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I3f51f6d0028015c72222250ba7521bbb169f4f7c
2012-08-15 08:28:51 -07:00
The Android Automerger
610331e25c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-15 06:35:03 -07:00
Satoshi Kataoka
96d2164f9c
am e6e64e11: am 4bf2c070: Merge "Step 30-A Constize gesture" into jb-mr1-dev
...
* commit 'e6e64e11d43cb2320a1fbef0ab8c87c32206657a':
Step 30-A Constize gesture
2012-08-15 02:43:43 -07:00
Satoshi Kataoka
e6e64e11d4
am 4bf2c070: Merge "Step 30-A Constize gesture" into jb-mr1-dev
...
* commit '4bf2c0703440a0c668ec071c36e82dd02d5caf30':
Step 30-A Constize gesture
2012-08-15 02:41:02 -07:00
Satoshi Kataoka
4bf2c07034
Merge "Step 30-A Constize gesture" into jb-mr1-dev
2012-08-15 02:39:32 -07:00
Jean Chalard
c15fa010fd
am e3884b04: am 91c64902: Merge "Refresh editor info when the text field attributes changes." into jb-mr1-dev
...
* commit 'e3884b041d24fb3dd4f9b53ddfb86cace75b450a':
Refresh editor info when the text field attributes changes.
2012-08-15 02:38:41 -07:00
Jean Chalard
e3884b041d
am 91c64902: Merge "Refresh editor info when the text field attributes changes." into jb-mr1-dev
...
* commit '91c64902b038976ae44d69dae7818f2c7adde863':
Refresh editor info when the text field attributes changes.
2012-08-15 02:37:21 -07:00
Jean Chalard
91c64902b0
Merge "Refresh editor info when the text field attributes changes." into jb-mr1-dev
2012-08-15 02:35:21 -07:00
Jean Chalard
e234aed428
Refresh editor info when the text field attributes changes.
...
For some reason we get a "restarting" flag from the browser
some times when the input field is different. The attributes
however are not the same, so we can detect that and reload
appropriately.
Bug: 6946793
Change-Id: I6762dae6f41db690497b026a707d9cc89c840b34
2012-08-15 18:32:59 +09:00
Jean Chalard
a01d0212d6
am 5252ca77: am cd0e0048: Merge "Ensure #offer always actually offers something." into jb-mr1-dev
...
* commit '5252ca773f9f5ce1ddd8afe423850c64834ba1a0':
Ensure #offer always actually offers something.
2012-08-15 02:19:53 -07:00
Jean Chalard
5252ca773f
am cd0e0048: Merge "Ensure #offer always actually offers something." into jb-mr1-dev
...
* commit 'cd0e0048881eb854a4d1524c2d54d6b9bb00f614':
Ensure #offer always actually offers something.
2012-08-15 02:17:54 -07:00
Jean Chalard
cd0e004888
Merge "Ensure #offer always actually offers something." into jb-mr1-dev
2012-08-15 02:16:09 -07:00
Jean Chalard
653dbfb8ed
Ensure #offer always actually offers something.
...
This will allow remaining requests after a call to terminate
correctly.
Bug: 6963142
Change-Id: Iff67058bb8a39f2f1b468d3894861e8125de6659
2012-08-15 18:10:10 +09:00
Satoshi Kataoka
f6be15cffe
Step 30-A Constize gesture
...
Change-Id: I6c0b89d96532dc1c8ca71bb730ba22de5592ec67
2012-08-15 17:21:53 +09:00
Satoshi Kataoka
f5b6272523
am 258eaa48: am 3979f060: Step 28-A Introduce the session Id to getSuggestion
...
* commit '258eaa48b4b7921a712dab24640273fd3e6c1efc':
Step 28-A Introduce the session Id to getSuggestion
2012-08-14 23:49:25 -07:00
Satoshi Kataoka
258eaa48b4
am 3979f060: Step 28-A Introduce the session Id to getSuggestion
...
* commit '3979f060f0650cbc117eee0307d05fb0be78c6f2':
Step 28-A Introduce the session Id to getSuggestion
2012-08-14 23:47:10 -07:00
Satoshi Kataoka
3979f060f0
Step 28-A Introduce the session Id to getSuggestion
...
Change-Id: I39d9bf1a7c272eb16d6ed4698f52457579b40f10
2012-08-15 15:44:45 +09:00
alanv
7508d32a5f
am 641373b7: am 05384933: Fix the build.
...
* commit '641373b7356cb874b8bd413d49f2840abe026260':
Fix the build.
2012-08-14 15:51:50 -07:00
alanv
641373b735
am 05384933: Fix the build.
...
* commit '05384933097c1e9c35e8be5c03757d072e5ffa46':
Fix the build.
2012-08-14 15:49:28 -07:00
alanv
0538493309
Fix the build.
...
Change-Id: I744f6232e81981ab694d3d1e92bab5fd6efa46c0
2012-08-14 15:34:29 -07:00
Charles Chen
bbd79bc4f0
am af0a0884: am dd7f7909: Merge "Change accessibility event type for app-driven speech." into jb-mr1-dev
...
* commit 'af0a0884463420b1a4e75780ba2b3eacae21c5ff':
Change accessibility event type for app-driven speech.
2012-08-14 14:38:22 -07:00
Charles Chen
af0a088446
am dd7f7909: Merge "Change accessibility event type for app-driven speech." into jb-mr1-dev
...
* commit 'dd7f79097af10aa448ec10128f261cbadf4842ac':
Change accessibility event type for app-driven speech.
2012-08-14 14:36:18 -07:00
Charles Chen
dd7f79097a
Merge "Change accessibility event type for app-driven speech." into jb-mr1-dev
2012-08-14 14:33:32 -07:00
Ying Wang
3f2378f15d
am 82b201ea: am 50eadf79: Retire LOCAL_NDK_VERSION.
...
* commit '82b201eaffbcf117f7723c184013d0e304ea25af':
Retire LOCAL_NDK_VERSION.
2012-08-14 12:21:19 -07:00
Ying Wang
82b201eaff
am 50eadf79: Retire LOCAL_NDK_VERSION.
...
* commit '50eadf798535cee9dd367ad0faf583938356ff40':
Retire LOCAL_NDK_VERSION.
2012-08-14 12:17:24 -07:00
Ying Wang
50eadf7985
Retire LOCAL_NDK_VERSION.
...
Bug: 6932421
Change-Id: I6cb8cdb3869c9c1c3d908f9c182e6f634ae76322
2012-08-14 12:07:28 -07:00
Ying Wang
d52310801d
Retire LOCAL_NDK_VERSION.
...
Bug: 6932421
Change-Id: I6cb8cdb3869c9c1c3d908f9c182e6f634ae76322
2012-08-14 10:34:14 -07:00
The Android Automerger
c639e6d396
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-14 07:08:02 -07:00
Ken Wakasa
5d7f267ffb
am 822139bd: am 267030dd: Cleanup casts.
...
* commit '822139bdf427bccd80fe46d925b90e03caedb773':
Cleanup casts.
2012-08-14 03:18:34 -07:00
Ken Wakasa
822139bdf4
am 267030dd: Cleanup casts.
...
* commit '267030dd82a6165ca56899d2988b5dc51ebea104':
Cleanup casts.
2012-08-14 03:16:27 -07:00
Ken Wakasa
267030dd82
Cleanup casts.
...
Change-Id: I3bf33ca407cc3bee9f5c4c6f929cdb1421b92c50
2012-08-14 19:03:09 +09:00