aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in master-release history after reset to masterThe Android Automerger2014-04-100-0/+0
|\
| * merge in master-release history after reset to masterThe Android Automerger2014-04-090-0/+0
| |\
| | * merge in master-release history after reset to masterThe Android Automerger2014-04-080-0/+0
| | |\
| | | * merge in master-release history after reset to masterThe Android Automerger2014-04-070-0/+0
| | | |\
| | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-050-0/+0
| | | | |\
| | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-030-0/+0
| | | | | |\
| | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-020-0/+0
| | | | | | |\
| | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-04-010-0/+0
| | | | | | | |\
| | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-310-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-290-0/+0
| | | | | | | | | |\
| | | | | | | | | | * Fix: NPE after onDestroy().•••Bug: 13671513 Change-Id: I06aa14870ff5422ad514356ee406600b247858c5 Keisuke Kuroyanagi2014-03-282-0/+15
| | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-270-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-260-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-250-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-240-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-220-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-200-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-190-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-180-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-170-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-150-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-130-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-120-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-03-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix a null object reference crash on Emoji Palette•••Do nothing if the current EmojiPageKeyboardView is null. BUG: 13006906 Change-Id: I169b70122ec939075b5be033953b48762fd528fc Conflicts: java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java Yohei Yukawa2014-02-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-02-030-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in master-release history after reset to masterThe Android Automerger2014-01-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\