summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path...ztenghui2014-11-141-6/+19
|\
| * am 475569e9: Merge "Fix the starting pen\'s position when a path close." into...ztenghui2014-11-131-6/+19
| |\
| | * Merge "Fix the starting pen's position when a path close." into lmp-mr1-devztenghui2014-11-131-6/+19
| | |\
| | | * Fix the starting pen's position when a path close.ztenghui2014-11-131-6/+19
* | | | am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-devAbhijith Shastry2014-11-147-0/+735
|\ \ \ \ | |/ / /
| * | | am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-devAbhijith Shastry2014-11-137-0/+735
| |\ \ \ | | |/ /
| | * | Merge "new sms/mms carrier app API" into lmp-mr1-devAbhijith Shastry2014-11-137-0/+735
| | |\ \
| | | * | new sms/mms carrier app APICheuksan Wang2014-11-127-0/+735
* | | | | am 91b5550e: am fdcdb742: Merge "[RemoveAccount API]: Adding support for inte...Simranjit Singh Kohli2014-11-132-15/+119
|\ \ \ \ \ | |/ / / /
| * | | | am fdcdb742: Merge "[RemoveAccount API]: Adding support for intent." into lmp...Simranjit Singh Kohli2014-11-132-15/+119
| |\ \ \ \ | | |/ / /
| | * | | Merge "[RemoveAccount API]: Adding support for intent." into lmp-mr1-devSimranjit Singh Kohli2014-11-132-15/+119
| | |\ \ \
| | | * | | [RemoveAccount API]: Adding support for intent.Simranjit Singh Kohli2014-11-072-15/+119
* | | | | | am 21f16a47: am 28d3c245: Merge "Cancel or drop key events if activity is sto...Wale Ogunwale2014-11-134-6/+36
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 28d3c245: Merge "Cancel or drop key events if activity is stopped." into l...Wale Ogunwale2014-11-134-6/+36
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Cancel or drop key events if activity is stopped." into lmp-mr1-devWale Ogunwale2014-11-134-6/+36
| | |\ \ \ \
| | | * | | | Cancel or drop key events if activity is stopped.Wale Ogunwale2014-11-124-6/+36
* | | | | | | am e2820ed9: am 87bc2acf: Merge "Optimize setting padding and backgrounds for...Adam Powell2014-11-132-10/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 87bc2acf: Merge "Optimize setting padding and backgrounds for views" into ...Adam Powell2014-11-132-10/+22
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Optimize setting padding and backgrounds for views" into lmp-mr1-devAdam Powell2014-11-132-10/+22
| | |\ \ \ \ \
| | | * | | | | Optimize setting padding and backgrounds for viewsAdam Powell2014-11-122-10/+22
* | | | | | | | am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled a...Ignacio Solla2014-11-1324-603/+292
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the sy...Ignacio Solla2014-11-1324-603/+292
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "[WebView] Allow the WebView to be compiled against the system SDK." in...Ignacio Solla2014-11-1324-603/+292
| | |\ \ \ \ \ \
| | | * | | | | | [WebView] Allow the WebView to be compiled against the system SDK.Ignacio Solla2014-11-1224-603/+292
* | | | | | | | | am fca2575b: am 6e33f0fb: Merge "Add extra for account migration in the Devic...Alexandra Gherghina2014-11-131-0/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 6e33f0fb: Merge "Add extra for account migration in the DevicePolicyMamage...Alexandra Gherghina2014-11-131-0/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-m...Alexandra Gherghina2014-11-131-0/+11
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add extra for account migration in the DevicePolicyMamagerAlexandra Gherghina2014-11-131-0/+11
* | | | | | | | | | am 856a0d06: am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLoc...Narayan Kamath2014-11-131-0/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am eed1fba6: Merge "Add detailed javadoc for AssetManager.getLocales." into l...Narayan Kamath2014-11-131-0/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Add detailed javadoc for AssetManager.getLocales." into lmp-mr1-devNarayan Kamath2014-11-131-0/+8
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Add detailed javadoc for AssetManager.getLocales.Narayan Kamath2014-11-121-0/+8
* | | | | | | | | | | am 4d9bd151: am fef1e0e7: Merge "Make Message.setAsynchronous() public." into...Jeff Brown2014-11-132-21/+25
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am fef1e0e7: Merge "Make Message.setAsynchronous() public." into lmp-mr1-devJeff Brown2014-11-132-21/+25
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Make Message.setAsynchronous() public." into lmp-mr1-devJeff Brown2014-11-132-21/+25
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Make Message.setAsynchronous() public.Jeff Brown2014-11-112-21/+25
* | | | | | | | | | | | am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same co...Adam Lesinski2014-11-131-4/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am db3d76ab: Merge "Fix ParceledListSlice to enforce the same concrete types ...Adam Lesinski2014-11-131-4/+43
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Fix ParceledListSlice to enforce the same concrete types among its ele...Adam Lesinski2014-11-131-4/+43
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix ParceledListSlice to enforce the same concrete types among its elements.Adam Lesinski2014-11-121-4/+43
| | | |/ / / / / / / / /
* | | | | | | | | | | | am 4978ebe0: am fa781f8c: Merge "Update GhostView properly when underlying vi...George Mount2014-11-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am fa781f8c: Merge "Update GhostView properly when underlying view changes." ...George Mount2014-11-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Update GhostView properly when underlying view changes." into lmp-mr1-devGeorge Mount2014-11-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | | * | | | | | | | | Update GhostView properly when underlying view changes.George Mount2014-11-111-1/+1
* | | | | | | | | | | | am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malform...Jeff Sharkey2014-11-121-0/+51
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with malformed certificates.Jeff Sharkey2014-11-121-0/+51
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 2e700004: am d68b87cd: Recover apps with malformed certificates.Jeff Sharkey2014-11-121-0/+51
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | am d68b87cd: Recover apps with malformed certificates.Jeff Sharkey2014-11-121-0/+51
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Recover apps with malformed certificates.Jeff Sharkey2014-11-121-0/+51
| | | * | | | | | | | | | DO NOT MERGE Fix finalizer ordering/double-free issueJohn Reck2014-11-071-9/+0