summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 6f127c9b: Merge "Initial implementation of USB Audio output."Paul McLean2014-04-013-0/+413
|\
| * Merge "Initial implementation of USB Audio output."Paul McLean2014-04-013-0/+413
| |\
| | * Initial implementation of USB Audio output.Paul McLean2014-03-313-0/+413
* | | am df42723d: Merge "Don\'t double prompt on booting encrypted device"Paul Lawrence2014-04-013-1/+74
|\ \ \ | |/ /
| * | Merge "Don't double prompt on booting encrypted device"Paul Lawrence2014-04-013-1/+74
| |\ \
| | * | Don't double prompt on booting encrypted devicePaul Lawrence2014-03-283-1/+74
* | | | am 4c9f4571: am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert Pendin...Katie McCormick2014-04-011-2/+2
|\ \ \ \ | |/ / /
| * | | am fb19fc61: am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.Katie McCormick2014-04-011-2/+2
| |\ \ \
| | * \ \ am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.Katie McCormick2014-04-011-2/+2
| | |\ \ \
| | | * \ \ am 87d9d1a0: Doc Update: revert PendingIntent fix.Katie McCormick2014-04-011-2/+2
| | | |\ \ \
| | | | * | | Doc Update: revert PendingIntent fix.Katie McCormick2014-03-311-2/+2
* | | | | | | am a780d932: Merge "Fix bug #13727850 Input values are not visible when setti...Fabrice Di Meglio2014-04-011-1/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix bug #13727850 Input values are not visible when setting up the loc...Fabrice Di Meglio2014-04-011-1/+12
| |\ \ \ \ \ \
| | * | | | | | Fix bug #13727850 Input values are not visible when setting up the lockscreen...Fabrice Di Meglio2014-03-311-1/+12
* | | | | | | | am 1a9b646c: Camera2: Fix missing capture result callback issueZhijun He2014-04-011-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Camera2: Fix missing capture result callback issueZhijun He2014-03-311-3/+3
* | | | | | | | am 6b96c1b2: am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU fo...Zhihai Xu2014-03-315-0/+72
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7d394df2: am ae1b763c: Merge "LE: Add API to configure MTU for a given con...Zhihai Xu2014-03-315-0/+72
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am ae1b763c: Merge "LE: Add API to configure MTU for a given connection (3/4)...Zhihai Xu2014-03-315-0/+72
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge "LE: Add API to configure MTU for a given connection (3/4)" into klp-mo...Zhihai Xu2014-03-315-0/+72
| | | |\ \ \ \ \
| | | | * | | | | LE: Add API to configure MTU for a given connection (3/4)Andre Eisenbach2014-03-255-0/+72
* | | | | | | | | am 2f9ec356: Merge "Make the reveal animation API public"ztenghui2014-03-311-6/+31
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Make the reveal animation API public"ztenghui2014-03-311-6/+31
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make the reveal animation API publicztenghui2014-03-311-6/+31
* | | | | | | | | | am ed99dc89: am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail mes...Brian Carlstrom2014-03-311-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509...Brian Carlstrom2014-03-311-1/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerE...Brian Carlstrom2014-03-311-1/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Improve detail message for X509TrustManagerExtensions argument validationBrian Carlstrom2014-03-311-1/+2
* | | | | | | | | | | am 53ab5174: Merge "Define trust agent framework components"Adrian Roos2014-03-316-5/+266
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Define trust agent framework components"Adrian Roos2014-03-316-5/+266
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Define trust agent framework componentsAdrian Roos2014-03-316-5/+266
* | | | | | | | | | | | am 883e04b3: Merge "Remove unthemed drawable cache, since canApplyTheme != is...Alan Viverette2014-03-311-54/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Remove unthemed drawable cache, since canApplyTheme != isThemed"Alan Viverette2014-03-311-54/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove unthemed drawable cache, since canApplyTheme != isThemedAlan Viverette2014-03-281-54/+5
* | | | | | | | | | | | | am 716f20d8: Merge "Define initial trust agent API"Adrian Roos2014-03-313-0/+204
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Define initial trust agent API"Adrian Roos2014-03-313-0/+204
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Define initial trust agent APIAdrian Roos2014-03-313-0/+204
* | | | | | | | | | | | | am b4a132a0: Merge "Turn on RenderThread"John Reck2014-03-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Turn on RenderThread"John Reck2014-03-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Turn on RenderThreadJohn Reck2014-03-311-1/+1
* | | | | | | | | | | | | am 8e150fef: Merge "Add invokeFunctor"John Reck2014-03-313-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Add invokeFunctor"John Reck2014-03-313-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Add invokeFunctorJohn Reck2014-03-283-0/+43
* | | | | | | | | | | | | am ab4fc115: am 1b09c97d: am 4447405d: Merge "Callback on correct method when...Wei Wang2014-03-291-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is un...Wei Wang2014-03-291-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | / / / / / / / / / | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 4447405d: Merge "Callback on correct method when status is unsuccessful." ...Wei Wang2014-03-291-2/+14
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Callback on correct method when status is unsuccessful." into klp-modu...Wei Wang2014-03-291-2/+14
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Callback on correct method when status is unsuccessful.Wei Wang2014-03-291-2/+14
* | | | | | | | | | | | | am c75db826: Merge "Remove kStatusInvoke & kStatusDraw"John Reck2014-03-292-39/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Remove kStatusInvoke & kStatusDraw"John Reck2014-03-292-39/+13
| |\ \ \ \ \ \ \ \ \ \ \ \