summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "Cleaning up AbsListView, fixing annotations and updating API calls."Alan Viverette2013-06-011-74/+93
|\
| * Cleaning up AbsListView, fixing annotations and updating API calls.Alan Viverette2013-05-311-74/+93
* | Merge "Split AbsListView.onTouchEvent into multiple methods for readability."Alan Viverette2013-06-011-289/+306
|\ \ | |/
| * Split AbsListView.onTouchEvent into multiple methods for readability.Alan Viverette2013-05-311-289/+306
* | Merge "Fix a bug resolving the correct icon/logo in action bars"Adam Powell2013-06-018-44/+83
|\ \
| * | Fix a bug resolving the correct icon/logo in action barsAdam Powell2013-05-318-44/+83
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-05-313-12/+12
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-05-293-12/+12
* | | | Merge "Clean up some temporary allocations."Dianne Hackborn2013-05-313-17/+27
|\ \ \ \
| * | | | Clean up some temporary allocations.Dianne Hackborn2013-05-303-17/+27
| | |/ / | |/| |
* | | | Merge "Remove MipmapDrawable"Romain Guy2013-05-311-4/+0
|\ \ \ \
| * | | | Remove MipmapDrawableRomain Guy2013-05-301-4/+0
* | | | | am 44baed2d: am af9e5e5f: Merge "Improve the documentation for InputConnectio...Jean Chalard2013-05-304-202/+600
|\ \ \ \ \
| * \ \ \ \ am af9e5e5f: Merge "Improve the documentation for InputConnection." into jb-m...Jean Chalard2013-05-304-202/+600
| |\ \ \ \ \
| | * \ \ \ \ Merge "Improve the documentation for InputConnection." into jb-mr2-devJean Chalard2013-05-314-202/+600
| | |\ \ \ \ \
| | | * | | | | Improve the documentation for InputConnection.Jean Chalard2013-05-304-202/+600
* | | | | | | | Merge "Resolve inconsistent conditions in InputMethodService"Satoshi Kataoka2013-05-311-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve inconsistent conditions in InputMethodServiceSatoshi Kataoka2013-05-301-2/+1
* | | | | | | | | am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity...Jeff Brown2013-05-301-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr...Jeff Brown2013-05-301-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-devJeff Brown2013-05-311-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.Jeff Brown2013-05-301-1/+1
| | | | |/ / / / | | | |/| | | |
* | | | | | | | am 5fecbf9d: am ec586994: Merge "CalendarView header not updated on year chan...Svetoslav2013-05-301-11/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am ec586994: Merge "CalendarView header not updated on year change." into jb-...Svetoslav2013-05-301-11/+8
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "CalendarView header not updated on year change." into jb-mr2-devSvetoslav2013-05-301-11/+8
| | |\ \ \ \ \ \
| | | * | | | | | CalendarView header not updated on year change.Svetoslav2013-05-291-11/+8
* | | | | | | | | am 491c6075: am 054255c6: Merge "Unhide action to launch Daydream settings." ...Daniel Sandler2013-05-301-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-devDaniel Sandler2013-05-301-1/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Unhide action to launch Daydream settings." into jb-mr2-devDaniel Sandler2013-05-301-1/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Unhide action to launch Daydream settings.Daniel Sandler2013-05-291-1/+0
* | | | | | | | | | am 0fdb05a7: am b190890a: Merge "Update javadoc to give app write better guid...Matthew Xie2013-05-305-4/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am b190890a: Merge "Update javadoc to give app write better guidence" into jb...Matthew Xie2013-05-305-4/+18
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Update javadoc to give app write better guidence" into jb-mr2-devMatthew Xie2013-05-305-4/+18
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Update javadoc to give app write better guidenceMatthew Xie2013-05-305-4/+18
| * | | | | | | | | am 50ef7ab7: Docfix: remove confusing "disabled" link label.John Spurlock2013-05-291-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Docfix: remove confusing "disabled" link label.John Spurlock2013-05-291-2/+2
* | | | | | | | | | Merge "wifi: Match function prototype from libhardware_legacy"Dmitry Shmidt2013-05-301-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | wifi: Match function prototype from libhardware_legacyDmitry Shmidt2013-05-291-2/+2
* | | | | | | | | | | Merge "UX compliance for error messages"Amith Yamasani2013-05-303-8/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | UX compliance for error messagesAmith Yamasani2013-05-303-8/+16
* | | | | | | | | | | Merge "Modifications needed for updating Skia to r9286."Derek Sollenberger2013-05-304-21/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Modifications needed for updating Skia to r9286.Derek Sollenberger2013-05-284-21/+21
* | | | | | | | | | | Merge "Optimizations for ResolverActivity"Adam Powell2013-05-302-13/+43
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Optimizations for ResolverActivityAdam Powell2013-05-292-13/+43
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge "Disable the AssetAtlas when running under valgrind Bug #9191438"Romain Guy2013-05-294-5/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disable the AssetAtlas when running under valgrindRomain Guy2013-05-294-5/+26
| |/ / / / / / / / /
* | | | | | | | | | am 2bf15756: am 91ea7882: am f64588a2: am de8ac602: am 963e3ec5: am 71d1af4a:...Dirk Dougherty2013-05-291-3/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | am 91ea7882: am f64588a2: am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201:...Dirk Dougherty2013-05-291-3/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am f64588a2: am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc c...Dirk Dougherty2013-05-291-3/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | am de8ac602: am 963e3ec5: am 71d1af4a: am a284e201: Merge "Doc change: adjust...Dirk Dougherty2013-05-281-3/+1
| | | |\ \ \ \ \ \