summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 58c9d472: Merge "More documentation updates for NFC." into gingerbreadJeff Hamilton2011-02-093-47/+117
|\
| * Merge "More documentation updates for NFC." into gingerbreadJeff Hamilton2011-02-093-47/+117
| |\
| | * More documentation updates for NFC.Jeff Hamilton2011-02-093-45/+115
* | | am 39cf3a44: Document NFC permissions.Nick Pelly2011-02-0811-12/+93
|\ \ \ | |/ /
| * | Document NFC permissions.Nick Pelly2011-02-0911-12/+93
| |/
* | am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gin...Jeff Hamilton2011-02-081-6/+17
|\ \ | |/
| * Improve the docs a bit for foreground dispatch.Jeff Hamilton2011-02-091-6/+17
* | am cdfe8999: Fix for multiple merge problem.Gilles Debunne2011-02-081-3/+1
|\ \ | |/
| * Fix for multiple merge problem.Gilles Debunne2011-02-041-3/+1
* | resolved conflicts for merge of c0728cc0 to gingerbread-plus-aospGilles Debunne2011-02-081-17/+40
|\ \ | |/
| * Double tap triggers text selection in a TextView. DO NOT MERGEGilles Debunne2011-02-041-17/+40
* | am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters whe...Kenny Root2011-02-041-1/+8
|\ \
| * \ am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting str...Kenny Root2011-02-041-1/+8
| |\ \
| | * \ Merge "JPtextinput: Dont break emoji characters when cutting strings."Kenny Root2011-02-041-1/+8
| | |\ \
| | | * | JPtextinput: Dont break emoji characters when cutting strings.Ishibashi Takako2011-01-101-1/+8
| | * | | Merge from gingerbreadJean-Baptiste Queru2011-02-031-2/+2
| | |\ \ \
* | | \ \ \ am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO...Gilles Debunne2011-02-041-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." ...Gilles Debunne2011-02-041-2/+2
| |\ \ \ \ \
| | * | | | | Blinking runnable is created only if text is editable. DO NOT MERGE.Gilles Debunne2011-01-111-2/+2
* | | | | | | am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into g...Gilles Debunne2011-02-041-3/+32
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbreadGilles Debunne2011-02-041-3/+32
| |\ \ \ \ \ \
| | * | | | | | All runnable are stopped on detach. DO NOT MERGE.Gilles Debunne2011-01-111-3/+32
| | |/ / / / /
* | | | | | | am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." ...Gilles Debunne2011-02-041-58/+36
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbreadGilles Debunne2011-02-041-58/+36
| |\ \ \ \ \ \
| | * | | | | | SelectAllOnFocus shows a higlighted text. DO NOT MERGE.Gilles Debunne2011-01-121-58/+36
| | |/ / / / /
* | | | | | | am 40684946: Merge "Fix docs type that broke build." into gingerbreadNick Pelly2011-02-033-14/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix docs type that broke build." into gingerbreadNick Pelly2011-02-033-14/+15
| |\ \ \ \ \ \
| | * | | | | | Fix docs type that broke build.Nick Pelly2011-02-033-14/+15
* | | | | | | | am 630ac8df: Merge "NFC documentation overhaul." into gingerbreadNick Pelly2011-02-0313-364/+857
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge "NFC documentation overhaul." into gingerbreadNick Pelly2011-02-0313-364/+857
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | NFC documentation overhaul.Nick Pelly2011-02-0313-364/+857
* | | | | | | Merge ee4c17ee from gingerbreadJean-Baptiste Queru2011-02-031-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge from open-source gingerbreadJean-Baptiste Queru2011-02-031-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Fix delivery report error with PENDING status in SMSSang-Jun Park2011-02-011-2/+2
* | | | | | am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"Jean-Baptiste Queru2011-02-011-1/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Don't crash zygote if webcore fails to loadJean-Baptiste Queru2011-01-311-1/+5
* | | | | | am cbf0983e: Merge "Final final final Gingerbread MR API changes." into ginge...Nick Pelly2011-02-016-31/+97
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Final final final Gingerbread MR API changes." into gingerbreadNick Pelly2011-02-016-31/+97
| |\ \ \ \ \
| | * | | | | Final final final Gingerbread MR API changes.Nick Pelly2011-02-016-31/+97
* | | | | | | am e6c6b760: DO NOT MERGE Fix issue #3408542: "resizeable" attribute required...Dianne Hackborn2011-01-311-2/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out o...Dianne Hackborn2011-01-311-2/+8
| |/ / / / /
* | | | | | am 1358b6a4: Tweak to make merges easierJean-Baptiste Queru2011-01-291-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Tweak to make merges easierJean-Baptiste Queru2011-01-291-1/+1
* | | | | | am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into ...Robert Greenwalt2011-01-291-0/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add some network types that OEM's are asking for.Robert Greenwalt2011-01-281-0/+9
* | | | | | am d350dc04: Merge "API: Make close() throw an IOException." into gingerbreadNick Pelly2011-01-273-4/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | API: Make close() throw an IOException.Nick Pelly2011-01-273-4/+5
* | | | | | am 21d0a173: Fix build - javadoc.Nick Pelly2011-01-271-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix build - javadoc.Nick Pelly2011-01-271-1/+1
* | | | | | am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbreadNick Pelly2011-01-272-30/+74
|\ \ \ \ \ \ | |/ / / / /
generated by cgit v1.1 at 2024-09-18 06:27:14 +0000