Commit graph

7674 commits

Author SHA1 Message Date
Yohei Yukawa
f2d0d9b0b9 Merge "Avoid the add-to-dictionary indicator from being clipped" into lmp-dev 2014-09-20 03:58:03 +00:00
Yohei Yukawa
9d2f606aa8 Avoid the add-to-dictionary indicator from being clipped
With this CL, the display bounds is taken into consideration
when the location of add-to-dictionary indicator is determined.

BUG: 17578360
Change-Id: I31e458fa7bbc33e539578b331fe1c51ff7f8668e
2014-09-19 19:19:56 +09:00
Keisuke Kuroyanagi
845c061970 Fix unit tests.
Change-Id: I7706db4c9279488552ea5fabc16dd1dd2bc7fa05
2014-09-19 19:02:08 +09:00
Jean Chalard
c648bae15d (DO NOT MERGE) Remove some logs which spam encrypted boot
Bug: 17539539
Change-Id: Idb442c2f0db2361b8e535f39b02d209b1edd1069
(cherry picked from commit 4b6c6fa0e4)
2014-09-19 07:29:03 +00:00
Mohammadinamul Sheik
6901ea6eac Invoke onWordCommitUserTyped on startInput() with non empty wordcomposer
In chat clients, the last committed word is not committed via
rich input connection. This will handle those missed out cases.

Change-Id: If3f1f6e1927cdf56a09d3e9124f05c66ca75de53
2014-09-18 23:00:11 -07:00
Adrian Velicu
bacf2dbac6 Merge "Added @UsedForTesting to 'missing' methods to avoid ProGuard removing them" 2014-09-19 05:39:31 +00:00
Adrian Velicu
8c889784e2 Added @UsedForTesting to 'missing' methods to avoid ProGuard removing them
Bug: 16864527
Change-Id: I698a1b3e09e7e9a12722169b37f87bd51c8cbd34
2014-09-19 14:31:33 +09:00
Jean Chalard
17511a41a4 Merge "[ML8] Add a language weight" 2014-09-19 05:15:51 +00:00
Jean Chalard
4b6c6fa0e4 Remove some logs which spam encrypted boot
Bug: 17539539
Change-Id: Idb442c2f0db2361b8e535f39b02d209b1edd1069
2014-09-19 14:02:23 +09:00
Jean Chalard
6da9b21191 [ML8] Add a language weight
...and rename an improperly named normalization value

Bug: 11230254
Change-Id: I0f5633148a9f66dbfd7d28540b8a8985131c4549
2014-09-19 13:44:42 +09:00
Tadashi G. Takaoka
00e018370f Merge "(DO NOT MERGE) Fix showing important notice even at beginning of sentence" into lmp-dev 2014-09-18 22:48:10 +00:00
Mohammadinamul Sheik
0e9419d014 Add word commit methods to StatsUtils
Change-Id: Ibb2cf0150cd9a851ff48d097688edc916dc82998
2014-09-18 13:06:38 -07:00
Sandeep Siddhartha
84185148c5 Add account listing and preference integration for current account
Bug: 17464068
Change-Id: Idb68a6012b285d6bc4632414bb6d11131148cf67
2014-09-18 10:39:30 -07:00
Sandeep Siddhartha
27bb70d6a0 Merge "Start showing the split keyboard layout" 2014-09-18 17:05:28 +00:00
Sandeep Siddhartha
a7c5dcdedf Merge "Add Accounts & privacy settings in LatinIME" 2014-09-18 16:49:34 +00:00
Keisuke Kuroyanagi
6624ea96f7 Merge "Pass prevWordCount to native code for getSuggestion." 2014-09-18 13:01:35 +00:00
Keisuke Kuroyanagi
8806248386 Pass prevWordCount to native code for getSuggestion.
Bug: 14425059
Change-Id: Id2b49a448982c997e5c0a22445b115e675156c3e
2014-09-18 19:18:55 +09:00
Tadashi G. Takaoka
0055d26164 Merge "Fix showing important notice even at beginning of sentence" 2014-09-18 10:01:49 +00:00
Tadashi G. Takaoka
f4c7eb478f Fix showing important notice even at beginning of sentence
This is a cherry-pick of Ic72d6fecc3 from lmp-dev.

Bug: 17536096
Change-Id: Id76b8f8dc85d03bc7ed5f24800301c081a82a8d2
2014-09-18 18:51:23 +09:00
Tadashi G. Takaoka
26b3d1de7e (DO NOT MERGE) Fix showing important notice even at beginning of sentence
Bug: 17536096
Change-Id: Ic72d6fecc3241c1a9aba87b82a46750cbd69e001
2014-09-18 09:45:37 +00:00
David Faden
5dda75b538 Add methods to get a Key's horizontal and vertical gaps.
Record the horizontal and vertical gap for the key, adding
corresponding accessors. This info is helpful in interpreting
corresponding touch points data.

Bug: 17400259
Change-Id: I825c537a48db35baab71580ff5c41cd911094a4b
2014-09-18 09:40:02 +00:00
Yohei Yukawa
eddfe51b38 resolved conflicts for merge of 233a2f21 to master
Change-Id: If391cc622367dfb4448c6a5c32b82111d352d86e
2014-09-18 18:27:45 +09:00
Jean Chalard
cdabc71c6d Merge "Add a Dictionary.isUserSpecific method." 2014-09-18 08:52:07 +00:00
David Faden
0c837daee6 Add a Dictionary.isUserSpecific method.
As the name suggests, returns true if the Dictionary is of a type
that may use user-specific data, e.g., contacts.

Cherry-pick of I11e71286c7635f50ace156dcc5308dbe51268d4e

Change-Id: I08c3f22f0c34eaa71bbd06594314f3b411658c5c
2014-09-18 17:42:37 +09:00
Yohei Yukawa
fa63d91095 Merge "Use Add-To-Dictionary indicator only" into lmp-dev 2014-09-18 07:13:42 +00:00
Yohei Yukawa
5896153f93 Use Add-To-Dictionary indicator only
With this CL, the previously used commit indicator was reverted.
Instead we use the add-to-dictionary indicator only at the moment.

This CL also fixes the indicator position in bidi context.

BUG: 17335734
Change-Id: I5f7cf173ddc30876e2b01320acaff8ba4265edf6
2014-09-18 16:06:35 +09:00
Tadashi G. Takaoka
e7c2d1c99c am 902cefb6: am 97ad4968: am bfabac44: Suppress voice input key on textWebEmailAddress field
* commit '902cefb6635053b682a917259eb5a964a17506fd':
  Suppress voice input key on textWebEmailAddress field
2014-09-18 06:15:41 +00:00
Tadashi G. Takaoka
bfabac449d Suppress voice input key on textWebEmailAddress field
Bug: 17486589
Change-Id: Ie9bf9266ee423b7e03cebcaa5f522accdd1a7802
2014-09-18 14:08:21 +09:00
Keisuke Kuroyanagi
ace9c14852 Merge "Use PrevWordsInfo.getPrevWordCount() in Java side." 2014-09-18 04:58:44 +00:00
Sandeep Siddhartha
081c2d386d Start showing the split keyboard layout
Change [3/3]

Added tests for Qwerty/en-US/split

Parse the switch-case statement from KeyboardBuilder to use the right layout.

Bug: 4968173
Change-Id: If4d6d71d5900525290268d8affa55dccf1ebd4f2
2014-09-17 20:56:57 -07:00
Sandeep Siddhartha
a4e0b6efdd Add Accounts & privacy settings in LatinIME
Also start showing the logging preference on this screen too.

This settings screen will be the container for all account
management, sync and privacy related settings

Bug: 17464068
Change-Id: Ie0806f6e8a542e9dea2834445ff7b38805207bda
2014-09-17 20:50:05 -07:00
Tadashi G. Takaoka
90f06760b9 Fix Romanian keyboard to promote "A with breve"
Bug: 17324498
Change-Id: Ie27f0023b2bfb18b0ee2051260ecf6bab75727a5
2014-09-18 11:48:29 +09:00
Jatin Matani
fc12c0a7fd Merge "Add a user preference for split layout within Appearance & Layouts" 2014-09-17 17:00:38 +00:00
Keisuke Kuroyanagi
4466464c24 Use PrevWordsInfo.getPrevWordCount() in Java side.
Bug: 14425059
Change-Id: Ie6295ff657c483876af403f2d474b7d857e5e3d6
2014-09-17 22:04:25 +09:00
Tadashi G. Takaoka
7d64bc3455 Merge "Revert "Revert "Fall back to default keyboard theme""" 2014-09-17 11:51:19 +00:00
Tadashi G. Takaoka
311f12d024 Revert "Revert "Fall back to default keyboard theme""
This reverts commit 821486ba8b.

Change-Id: If0285c87edcd5f7d3c5449026953a74bf1125f65
2014-09-17 11:51:09 +00:00
Tadashi G. Takaoka
c6cc000892 Merge "Revert "Fall back to default keyboard theme"" 2014-09-17 11:46:50 +00:00
Tadashi G. Takaoka
821486ba8b Revert "Fall back to default keyboard theme"
This reverts commit 6ed8b18326.

Change-Id: I48f775e54f4077e556b26bc0146bc918421c6845
2014-09-17 11:46:40 +00:00
Tadashi G. Takaoka
e2a396eef0 Merge "Fall back to default keyboard theme" 2014-09-17 11:23:56 +00:00
Tadashi G. Takaoka
6ed8b18326 Fall back to default keyboard theme
Bug: 17537884
Change-Id: I3452d6d4a5837c6b2d417c8d256c121df86131cc
2014-09-17 19:36:22 +09:00
Adrian Velicu
f116f91033 Making spelling of the word "distracters" consistent
Bug: 17537869
Change-Id: Ibfc1c84aff72aeb76c9b127503369d00f3dfaceb
2014-09-17 17:32:43 +09:00
Jatin Matani
a5d4cb7769 Add a user preference for split layout within Appearance & Layouts
Note The preference is flag protected.

Change-Id: I1be219ba961f002897b7b13ff9f200e2f142b2d8
2014-09-16 23:27:01 -07:00
Tadashi G. Takaoka
44398bb5e1 am cf5fc1ea: am 4e1f1689: am 5ae05786: Merge "Fix drawing of custom action label key" into lmp-dev
* commit 'cf5fc1ea065873cd6d7b1d5d467940e4e45354d3':
  Fix drawing of custom action label key
2014-09-16 23:59:08 +00:00
Mohammadinamul Sheik
16bfac9ff4 Add StatsUtils.onAutoCorrection method.
Change-Id: I9547b6c0f082ef7c09b251a6458badb65a841229
2014-09-16 12:34:22 -07:00
Jean Chalard
618907e1f1 Merge "[ML7] Have multiple DictionaryGroup instances in facilitator" 2014-09-16 11:31:27 +00:00
Jean Chalard
8cd5326622 [ML7] Have multiple DictionaryGroup instances in facilitator
This is the central change of multilingual input.

Bug: 11230254
Change-Id: Id8b68fb101e837e8cf182ab4bc1e55e4da5cc49d
2014-09-16 19:00:50 +09:00
Tadashi G. Takaoka
dad7a5dffd Fix drawing of custom action label key
Bug: 17488054
Change-Id: I433561ed19ec2a79402867a0395a3e388730f087
2014-09-16 18:21:49 +09:00
Sandeep Siddhartha
23f38149c6 Merge "Add a canSplitKeyboard attribute for specifying split keyboard layouts" 2014-09-16 03:05:46 +00:00
Jatin Matani
9b140f4e4f am 4d8efc97: am b41d1fcd: am d0d8f90a: Merge "Reorganize settings in Google Keyboard" into lmp-dev
* commit '4d8efc97873d12b4596c695fbcf7e72330b5253e':
  Reorganize settings in Google Keyboard
2014-09-13 02:12:24 +00:00
Ken Wakasa
64176158e7 resolved conflicts for merge of 75513e51 to master
Change-Id: I058c3e63e5e349b58b2bdd2723cb43fbc24a0425
2014-09-13 10:41:19 +09:00
Ken Wakasa
8ed81f9fd7 resolved conflicts for merge of 8e9385cc to master
Change-Id: Ia6d192ee4a8496afa3f788894844ebef78fb7a8c
2014-09-13 09:25:23 +09:00
Sandeep Siddhartha
3939455c1d Add a canSplitKeyboard attribute for specifying split keyboard layouts
Change [1/3]

This'll be used in conjunction with a user preference to split the keyboard when possible.

Bug: 4968173
Change-Id: I7a05948d67b94a55024790115ae261d7fef7941a
2014-09-12 18:46:14 +09:00
Jatin Matani
d0d8f90a32 Merge "Reorganize settings in Google Keyboard" into lmp-dev 2014-09-12 09:12:01 +00:00
Tadashi G. Takaoka
fd5f2b91fd Merge "Fix not always showing input view with physical keyboard connected" into lmp-dev 2014-09-12 09:02:31 +00:00
Tadashi G. Takaoka
3a90cb9ad0 Reorganize settings in Google Keyboard
Changes :
Input languages ->  Languages
Input preferences -> Preferences
Multi lingual Options -> Multilingual Options
Keyboard Theme -> Theme
Gesture typing preferences -> Gesture typing

**New
 Appearance
        -> Theme
        -> Custom input style

**Removed
 Multilingual options from L dynamically

Bug: 11866784
Change-Id: I07404c27868e1b087b0cafb63d2031a5b493a885
2014-09-12 02:00:26 -07:00
Jean Chalard
7aa47cb374 Only do double-space-period on real text fields.
Bug: 15559216
Change-Id: Id6ecadc58c03889496967d67371457e4050d695b
2014-09-12 17:49:47 +09:00
Tadashi G. Takaoka
88f282de0d Fix not always showing input view with physical keyboard connected
Bug: 17163374
Change-Id: I57f7eeac0c9ac0a15d3d55927e18a2d97849c508
2014-09-12 17:45:35 +09:00
Yohei Yukawa
97b465044f am ead70974: am 27ccbeb4: am cd119050: Support CursorAnchorInfo in the full-screen mode
* commit 'ead70974aecd78d5bad0fa87a759f6bf82dcb503':
  Support CursorAnchorInfo in the full-screen mode
2014-09-11 17:31:47 +00:00
Jean Chalard
96f0ae5e68 [ML6] Have asyncReloadMainDictionary support multiple locales
Change-Id: I4c3dfaad38ec1cc91d1a9f81d5ff45ef12f70029
2014-09-11 19:05:22 +09:00
Jean Chalard
e6df5f015c [ML5] Rewrite resetDictionariesWithDictNamePrefix
This change rewrites resetDictionariesWithDictNamePrefix so
that it would work if there were several locales, which is going to
happen shortly. This change on its own is quite large and difficult
already, so I didn't want to merge it into the change that actually
makes several locales happen; another such change is following.

Change-Id: Ibb80b05b73c0f0f0bea64b7e308cc4d38ca448f9
2014-09-11 19:05:19 +09:00
Yohei Yukawa
cd11905022 Support CursorAnchorInfo in the full-screen mode
This CL allows to emulate the behavior of CursorAnchorInfo
in the full-screen mode to work around the limitation of
the framework.

Basically this CL copies relevant code from the framework
to LatinIME. This is actually a code duplicate which isn't
great, but probably the only way that is available right now.

Change-Id: I30bc8c3387c91c8e47252ba699cbd967d8927dad
2014-09-11 18:36:53 +09:00
Jatin Matani
fd96928175 Merge "Adds StatsUtil methods for LatinIME.on{Start,Create,Finish}inputView" 2014-09-11 03:14:57 +00:00
Keisuke Kuroyanagi
af1a06d7e1 Enable personalization for multilingual users.
Bug: 16547557
Change-Id: I03eda34edc902fc4732d16d234216344d8d84d88
2014-09-10 18:23:09 +09:00
Keisuke Kuroyanagi
89e34169f8 Get locale using detected language for personalization.
Bug: 16547557
Change-Id: If3d88a548e5a2255ff81c819b056f77bfbe237ae
2014-09-10 18:23:07 +09:00
Jatin Matani
1c45f9142b Adds StatsUtil methods for LatinIME.on{Start,Create,Finish}inputView
Change-Id: I4e7dc008b98e398c38aafea5cb31156dde7f42ea
2014-09-10 15:55:15 +09:00
Mohammadinamul Sheik
97243cea28 Merge "Add backspace event methods to StatsUtils" 2014-09-10 04:56:23 +00:00
Keisuke Kuroyanagi
934e1d8087 Merge "Move case and OOV detection logic into distracter filter." 2014-09-10 03:49:10 +00:00
Keisuke Kuroyanagi
d843081193 Move case and OOV detection logic into distracter filter.
Bug: 16547557

Change-Id: I8502585976deb5e93fff3b1e0266654b8a927bda
2014-09-10 11:25:34 +09:00
Mohammadinamul Sheik
acdd2e4572 Add backspace event methods to StatsUtils
Change-Id: Id45d217073e49ca5f2ba639b608d168d136bba58
2014-09-10 10:54:49 +09:00
Tadashi G. Takaoka
63ee10d63a am c29276b7: am 12814352: am 486c4894: Keep aspect ratio of Material action key background
* commit 'c29276b782cfc45be5ab79177e991f2cba8fb04b':
  Keep aspect ratio of Material action key background
2014-09-09 15:03:15 +00:00
Tadashi G. Takaoka
486c4894ce Keep aspect ratio of Material action key background
Bug: 15681452
Change-Id: Ie4b823dca541b76b68cade580845a21ff0b21e2f
2014-09-09 14:28:46 +09:00
Jean Chalard
ef0ef2d0b9 am beb74610: am ab18b5f1: am 9395014e: Don\'t resume suggestions with H/W keyboard
* commit 'beb746103011149d6dfce10278475946e679263d':
  Don't resume suggestions with H/W keyboard
2014-09-08 13:52:25 +00:00
Jean Chalard
7140035932 Fix a missing initialization
Change-Id: I14a35f5a38b6e0f48c95cbb8c0c6e4507cd61fa7
2014-09-08 22:40:36 +09:00
Jean Chalard
1cf2acd8de am 61e7afa6: am 0eaa25e0: am 914078fd: Fix a bug where recorrection would stop on connectors
* commit '61e7afa6fa98939f9dcb9f7a2ebb5678a51d4201':
  Fix a bug where recorrection would stop on connectors
2014-09-08 13:20:27 +00:00
Jean Chalard
9395014e76 Don't resume suggestions with H/W keyboard
...unless we do support a hardware keyboard, which we still
do not at the moment.

Change-Id: Iec24b1ae8ba5e23e0bbb7e5a468b7404296d4b18
2014-09-08 22:14:02 +09:00
Jean Chalard
b41ee67194 Fix the sentence separator for Hindi.
Change-Id: I623e4ccbc324751eb67ec4bb777e2be5ae2a60d1
Bug: 17418371
2014-09-08 21:54:28 +09:00
Jean Chalard
914078fd91 Fix a bug where recorrection would stop on connectors
Bug: 16733686
Change-Id: I7a9f79a81e33a1f5bf5f3daf0b78d0f1e4447e7a
2014-09-08 21:47:01 +09:00
Yohei Yukawa
a48fe12b9c am 42ddc212: am f930ce12: am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev
* commit '42ddc2127deb117a0bb2b7a7797cb8c9ba335f5a':
  Follow up API signature changes of CursorAnchorInfo
2014-09-08 09:35:00 +00:00
Jean Chalard
653546a618 am c3fac52d: am 1f74ba17: am cb077f75: Merge "Resolve an old TODO." into lmp-dev
* commit 'c3fac52dd51ba70db83d96b2d421bd440683d9bc':
  Resolve an old TODO.
2014-09-08 09:34:58 +00:00
Yohei Yukawa
1caa0b714d Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev 2014-09-08 09:11:41 +00:00
Jean Chalard
a1d2315499 Merge "Fix a bug with the Greek question mark." 2014-09-08 08:58:27 +00:00
Jean Chalard
cb077f75ac Merge "Resolve an old TODO." into lmp-dev 2014-09-08 08:57:23 +00:00
Yohei Yukawa
a8ecd29646 Follow up API signature changes of CursorAnchorInfo
This is a follow up CL for Ic8c6fab58c01206872a34e7ee604cdda.

No behavior change is intended in this CL.

BUG: 17365414
BUG: 17335734
Change-Id: I4299536d0cb0c660b7b564653c72c9cb409a7aa5
2014-09-08 17:07:34 +09:00
Mohammadinamul Sheik
74332597d6 Merge "Add StatsUtils.onPickSuggestionManually and SuggestedWords.indexOf." 2014-09-08 06:52:02 +00:00
Jean Chalard
b526a894db Fix a bug with the Greek question mark.
Bug: 17398284
Change-Id: If49593e2c959935a183a4cd9d988407cc1160599
2014-09-08 15:33:51 +09:00
Tadashi G. Takaoka
100a8aec5b am ad4de3fc: am 9ca6658e: am 0f33e614: Implement Floating Action Button more keys keyboard
* commit 'ad4de3fc819d658775eed470fc74ad76da5caad2':
  Implement Floating Action Button more keys keyboard
2014-09-08 06:07:52 +00:00
Tadashi G. Takaoka
e1b10aedd7 am 3aabf655: am f21c77d7: am 727e818e: Move more keys divider to MoreKeysKeyboardView
* commit '3aabf655d0125fb824e5e47687f5084b2df6979c':
  Move more keys divider to MoreKeysKeyboardView
2014-09-08 05:42:32 +00:00
Tadashi G. Takaoka
0f33e614c0 Implement Floating Action Button more keys keyboard
Bug: 15681452
Change-Id: I8484e4fe4d989b391f2b5230836dc9dfac218429
2014-09-08 14:34:33 +09:00
Mohammadinamul Sheik
c74ffe8edc Add StatsUtils.onPickSuggestionManually and SuggestedWords.indexOf.
Change-Id: I1588448154d086569cb026825fdc36cd1812a582
2014-09-07 20:43:48 -07:00
Tadashi G. Takaoka
727e818e95 Move more keys divider to MoreKeysKeyboardView
Bug: 15681452
Change-Id: I1b32719cc927a24db4c41fdeb812b39f7e98a85c
2014-09-08 11:02:07 +09:00
Tadashi G. Takaoka
8b7ed7f6c6 am 079f9c3f: am 1b430219: am 6888ec00: Merge "Create donottranslate debug settings string resources file" into lmp-dev
* commit '079f9c3f5ae7b2f7926321522b6020affd422b52':
  Create donottranslate debug settings string resources file
2014-09-05 17:23:45 +00:00
Jean Chalard
6bb6d30344 Resolve an old TODO.
This is cleaner.

Bug: 17347779
Change-Id: I5b612783b1ec98a1a11401f00d68db49654f3023
2014-09-05 20:10:29 +09:00
Jean Chalard
46d111ff4a Merge "Fix a bug where CAPS_WORDS would not be returned." 2014-09-05 09:53:51 +00:00
Jean Chalard
17901db691 Fix a bug where CAPS_WORDS would not be returned.
Also introduce some unit tests that would have caught the bug.

Bug: 17398284
Change-Id: Idb715b7bd2f70992d6cdf4e25ef368809382caef
2014-09-05 07:56:25 +00:00
Tadashi G. Takaoka
f0f49f9806 Create donottranslate debug settings string resources file
This is a follow up of the I26e4d292de.

Bug: 15678343
Bug: 17385083
Change-Id: I2c2b08b8dd991ac981aa8f8c8436de9e4399da5f
2014-09-05 11:38:29 +09:00
Jean Chalard
78d1dcd356 [ML4] Rename Dictionaries to DictionaryGroup
We're going to have multiple DictionaryGroup objects and it
would be very confusing to have this class name a plural.

Change-Id: I8f5c621459ede49f245be26097fe71f44289761c
2014-09-04 18:35:47 +09:00
Tadashi G. Takaoka
964877a8f2 am c297197b: am 1c2cf719: Add new value "spacebar" to Key.backgroundType attribute
* commit 'c297197b1548307c31017ba3dc89bbb6bbf2223e':
  Add new value "spacebar" to Key.backgroundType attribute
2014-09-03 17:55:54 +00:00
Tadashi G. Takaoka
e355274642 am ec7d6752: am 5a9c9649: Removes "customAction" value from Key.backgroundType attribute
* commit 'ec7d67529e0dd4e5bf87e3b96c4b78db44adb96f':
  Removes "customAction" value from Key.backgroundType attribute
2014-09-03 17:55:53 +00:00
Tadashi G. Takaoka
6a4e9218ca am 2a7a5740: am 0af2472a: Add new "keyboardTheme" <case> predicator
* commit '2a7a5740e929503a0aca23f376175a9c118b7a83':
  Add new "keyboardTheme" <case> predicator
2014-09-03 17:55:52 +00:00
Yohei Yukawa
5d7b24f29c am f2c509a8: am 310da35c: Merge "Follow up API signature change" into lmp-dev
* commit 'f2c509a81ef107e6c71dc6804417469d12c94fca':
  Follow up API signature change
2014-09-03 17:41:46 +00:00