summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am ed517771: Merge changes I5d21645b,I8928e357Winson Chung2014-05-091-7/+10
|\
| * Merge changes I5d21645b,I8928e357Winson Chung2014-05-091-7/+10
| |\
| | * Fixing NPE in accessing theme attribute.Winson Chung2014-05-091-7/+10
* | | am 2d3af881: Merge "Refactor VirtualLightRefBase & JNI"John Reck2014-05-092-20/+62
|\ \ \ | |/ /
| * | Merge "Refactor VirtualLightRefBase & JNI"John Reck2014-05-092-20/+62
| |\ \
| | * | Refactor VirtualLightRefBase & JNIJohn Reck2014-05-092-20/+62
* | | | am 1668b19d: Merge "Battery stats tweaks."Dianne Hackborn2014-05-092-122/+179
|\ \ \ \ | |/ / /
| * | | Merge "Battery stats tweaks."Dianne Hackborn2014-05-092-122/+179
| |\ \ \
| | * | | Battery stats tweaks.Dianne Hackborn2014-05-092-122/+179
* | | | | am 6b2350ac: Merge "WindowManagerService: add some defensive checks"Kenny Root2014-05-091-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "WindowManagerService: add some defensive checks"Kenny Root2014-05-091-2/+2
| |\ \ \ \
| | * | | | WindowManagerService: add some defensive checksKenny Root2014-05-091-2/+2
* | | | | | am f37bec2b: Merge "Cleanup remainings of old webview."Selim Gurun2014-05-092-29/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Cleanup remainings of old webview."Selim Gurun2014-05-092-29/+0
| |\ \ \ \ \
| | * | | | | Cleanup remainings of old webview.Selim Gurun2014-05-082-29/+0
* | | | | | | am 2a894fed: Merge "Display: Brightness: Low power mode scales the brightness...Ruchi Kandoi2014-05-091-2/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Display: Brightness: Low power mode scales the brightness to 50 percent.Ruchi Kandoi2014-05-091-2/+8
* | | | | | | am 02701776: Merge "resolved conflicts for merge of 88aa8aab to master"Vinod Krishnan2014-05-091-19/+55
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "resolved conflicts for merge of 88aa8aab to master"Vinod Krishnan2014-05-091-19/+55
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | resolved conflicts for merge of 88aa8aab to masterVinod Krishnan2014-05-091-19/+55
| | |\ \ \ \ \
| | | * \ \ \ \ am c4ebd014: Merge "Adding a margin for the AlertDialog to work on circular U...Vinod Krishnan2014-05-091-20/+55
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-...Vinod Krishnan2014-05-091-20/+55
| | | | |\ \ \ \ \
| | | | | * | | | | Adding a margin for the AlertDialog to work on circular UI.Vinod Krishnan2014-05-091-20/+55
* | | | | | | | | | am 91325444: Merge "Camera2: Minor update for exposureCompensation spec"Yin-Chia Yeh2014-05-092-2/+32
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Camera2: Minor update for exposureCompensation spec"Yin-Chia Yeh2014-05-092-2/+32
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Camera2: Minor update for exposureCompensation specYin-Chia Yeh2014-05-092-2/+32
* | | | | | | | | | am 87bf3b28: Merge "Introduce persistent forms of Activity lifecycle calls."Craig Mautner2014-05-097-70/+278
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Introduce persistent forms of Activity lifecycle calls."Craig Mautner2014-05-097-70/+278
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Introduce persistent forms of Activity lifecycle calls.Craig Mautner2014-05-097-70/+278
* | | | | | | | | | am d8bbf999: Merge "Fix badness from proxy refactoring."Jason Monk2014-05-091-1/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix badness from proxy refactoring."Jason Monk2014-05-091-1/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix badness from proxy refactoring.Jason Monk2014-05-091-1/+3
* | | | | | | | | | | am f25ec68c: am a08771ed: am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog...Mikhail Naganov2014-05-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am a08771ed: am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for lo...Mikhail Naganov2014-05-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of atte...Mikhail Naganov2014-05-091-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call ...Mikhail Naganov2014-05-091-0/+1
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ am 6940b664: Add EventLog event for logging of attempts to call java.lang.Obj...Mikhail Naganov2014-05-091-0/+1
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Add EventLog event for logging of attempts to call java.lang.Object.getClassMikhail Naganov2014-05-081-0/+1
| | * | | | | | | | | | | am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature.Eino-Ville Talvala2014-05-091-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | DO NOT MERGE: Add android.hardware.camera.external feature.Eino-Ville Talvala2014-05-081-1/+9
| | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
* | | | | | | | | | | | am 1be633f9: Allow setting password restrictions from a managed profile.Jessica Hummel2014-05-091-25/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Allow setting password restrictions from a managed profile.Jessica Hummel2014-05-091-25/+31
* | | | | | | | | | | | am b1786021: Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATIONBen Murdoch2014-05-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATIONBen Murdoch2014-05-091-0/+1
* | | | | | | | | | | | am e6d58c4c: Merge "Introduce new API for floating window support"Yohei Yukawa2014-05-099-12/+819
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Introduce new API for floating window support"Yohei Yukawa2014-05-099-12/+819
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Introduce new API for floating window supportYohei Yukawa2014-05-099-12/+819
* | | | | | | | | | | | | am 690022d1: Merge "Add api for getting the parent of a profile."Jessica Hummel2014-05-092-3/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Add api for getting the parent of a profile."Jessica Hummel2014-05-092-3/+21
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add api for getting the parent of a profile.Jessica Hummel2014-05-082-3/+21