aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix possible SIOOBESatoshi Kataoka2013-03-271-2/+9
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8461021 Change-Id: I8b0385610b80b5a672ec380935c485a0e01ae984
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / / am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"Kurt Partridge2013-03-262-17/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ef103e1f2e0a94e9445dd9b55516dcf59b05ee2f': Close ResearchLogger upon onFinishInputView
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Close ResearchLogger upon onFinishInputView"Kurt Partridge2013-03-262-17/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close ResearchLogger upon onFinishInputViewKurt Partridge2013-03-252-17/+17
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, ResearchLogger#stop() was called both in LatinIME#onFinishInputView() and in LatinIME#onWindowHidden(). This resulted in multiple logs being written. Since onFinishInputView is the more reliable of the two (it is called in InputMethodService#onDestroy; onWindowHidden is not), the code now uses onFinishInputView as a stopping signal. Change-Id: Iae4b8c3bdab226027624eeab19b3737367e4a108
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release ↵The Android Open Source Project2013-03-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit '22384b57bdfee87368417ecc2eb7728fd6f4dd2e':
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ed901ff17f583f37d0262e10d5590c80c23fc93':
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-03-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f4f70c6f405f6f6703c2a063475714ad48462d7
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-250-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ef86bbce: Add const_cast to live with host\'s jni.hTadashi G. Takaoka2013-03-263-22/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ef86bbceaef53acbb4e56e2fa45a7dd0e3c2ccdb': Add const_cast to live with host's jni.h
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add const_cast to live with host's jni.hTadashi G. Takaoka2013-03-263-22/+36
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7970626 Change-Id: I2fd09e16dd9df36eebca2d737a0b7cc3ddd1c862
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 73d00e68: Merge "Use XmlPullParser.getEventType()"Tadashi G. Takaoka2013-03-252-17/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '73d00e68d8fcd64ce28fc5bed6881100a0fead9b': Use XmlPullParser.getEventType()
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use XmlPullParser.getEventType()"Tadashi G. Takaoka2013-03-262-17/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Use XmlPullParser.getEventType()Tadashi G. Takaoka2013-03-262-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie423d3416639f81409cc920658c8088b7519b045
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0b327101: Merge "Fix possible NPE"Satoshi Kataoka2013-03-251-19/+21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b3271010fe6e438d57a5d4504e021e001bb9f5e': Fix possible NPE
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix possible NPE"Satoshi Kataoka2013-03-261-19/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Fix possible NPESatoshi Kataoka2013-03-251-19/+21
| | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8457109 Change-Id: I321fbef53e20a7c36ef4bd9f544b50abe6a52be9
* | | | | | | | | | | | | | | | | | | | | | | | | | am d17b69ec: Clean up XmlParserUtilsTadashi G. Takaoka2013-03-253-27/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd17b69ec000adc02f057fa69055411fd5438885f': Clean up XmlParserUtils
| * | | | | | | | | | | | | | | | | | | | | | | | Clean up XmlParserUtilsTadashi G. Takaoka2013-03-263-27/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I636e8f359d47f39e61a7f77e3e686f2721779b6f
* | | | | | | | | | | | | | | | | | | | | | | | | am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import ↵Baligh Uddin2013-03-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '5f976d1cef0eeec5cf9e4202560d927abded5426': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | | | | | am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGEBaligh Uddin2013-03-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff41125b74053ff3ad006f5dfd824e2351a47ee4': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | | | | | am fba54597: Import translations. DO NOT MERGEBaligh Uddin2013-03-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fba545975020525c0017bde8424db28dd21d5186': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-251-1/+1
| | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I502c6b5a38d4495774179eb587775e713d5c98c9 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | | | am 6616188e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-03-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6616188ea6f127f2f1bb821d2a99972d5384626e': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-251-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8468f1e69374a5ada2ea03e427895b771b8dc048 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-251-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7457efe556011fc20d44ea5d58dba92d31feb566 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | | | am fb658d6c: Fix possible ArrayIndexOutOfBoundsExceptionTadashi G. Takaoka2013-03-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb658d6c531de8cfd55e4d36bffc9ccabc401f94': Fix possible ArrayIndexOutOfBoundsException
| * | | | | | | | | | | | | | | | | | Fix possible ArrayIndexOutOfBoundsExceptionTadashi G. Takaoka2013-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8461864 Change-Id: Icd8f4f51ec064461c08d00c1c58bedf5fbae2553
* | | | | | | | | | | | | | | | | | | am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import ↵Baligh Uddin2013-03-220-0/+0
|\| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '1e5add78094c7716ce063748e839d223b5a115a5': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGEBaligh Uddin2013-03-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7668deece811d5f11ee652d6b5e5d7611273b270': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | am 21160c4e: Import translations. DO NOT MERGEBaligh Uddin2013-03-2349-1631/+1551
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '21160c4eba74344a583cae423b1909483559c87f': Import translations. DO NOT MERGE
| | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-2249-1631/+1551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7531241854018cd052606f7f4a9b82fccd2e725c Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-03-220-0/+0
|\| | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'afe343c16fbb3c15ff8d6cf376b750737c675307': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-03-2349-1730/+1942
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-2249-1730/+1942
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84d0b4a11df3ac9a5706419e5c9f76eeb8c5cfd1 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-03-2349-1730/+1942
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-03-2249-1730/+1942
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31bcd942f18166658143b4dbd5695f66f4717a22 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.Alan Viverette2013-03-221-20/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | * commit 'a7b4398c35eaf87fd00086f660af7710c071c369': Don't announce changes for A11y within the same keyboard mode.
| * / / / / / / / / / / / / / / Don't announce changes for A11y within the same keyboard mode.Alan Viverette2013-03-221-20/+17
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8439108 Change-Id: If9f14bb65625468dcd399df47ad0d2123be30be7
* | | | | | | | | | | | | / / am 19a70087: Merge "Fix appname"Satoshi Kataoka2013-03-2257-1343/+49
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '19a7008728867aa639a2fac66459ce3fe0526cd8': Fix appname
| * | | | | | | | | | | | | Merge "Fix appname"Satoshi Kataoka2013-03-2257-1343/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix appnameSatoshi Kataoka2013-03-2257-1343/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6789579 Change-Id: Ic4694e36e0846af95fa8dcdef919be251983b528
* | | | | | | | | | | | | | | am 3a8a63c3: Remove unused importTadashi G. Takaoka2013-03-212-2/+0
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a8a63c3999c0ffccbaa08a860e807bb59c1643f': Remove unused import
| * | | | | | | | | | | | | Remove unused importTadashi G. Takaoka2013-03-222-2/+0
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up of I062c076f. Change-Id: Ic3a83d95aed1f86121ed552a6f20f0d24f9d6d83
* | | | | | | | | | | / / am c6452f25: Merge "Remove reference to string.english_ime_name"Tadashi G. Takaoka2013-03-213-11/+15
|\| | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6452f2569448aee841ad70baaa27c660a753aff': Remove reference to string.english_ime_name
| * | | | | | | | | | | Merge "Remove reference to string.english_ime_name"Tadashi G. Takaoka2013-03-223-11/+15
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove reference to string.english_ime_nameTadashi G. Takaoka2013-03-223-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6789579 Change-Id: I062c076f0ca16cc39274e20955aa83d667b7380d
* | | | | | | | | | | | | am f4352c2c: Merge "Use correct appname resource"Satoshi Kataoka2013-03-211-7/+8
|\| | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4352c2ce3849444c4a930fe7e5319ecdfd5d18a': Use correct appname resource
| * | | | | | | | | | | Merge "Use correct appname resource"Satoshi Kataoka2013-03-221-7/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Use correct appname resourceSatoshi Kataoka2013-03-221-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6789579 Change-Id: Id11435a28d6c5b6c72867814e23f5e62429080f8