summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Prevent transformed ops from merging in the first placeChris Craik2013-04-181-0/+2
* Merge "FLAG_DISMISS_KEYGUARD should not hide status bar if secure." into jb-m...John Spurlock2013-04-161-1/+2
|\
| * FLAG_DISMISS_KEYGUARD should not hide status bar if secure.John Spurlock2013-04-121-1/+2
* | am ce2c3de7: am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef:...Dirk Dougherty2013-04-153-174/+703
|\ \
| * \ am aac8d988: am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: ...Dirk Dougherty2013-04-153-174/+703
| |\ \
| | * \ am 14ad06cf: am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet ba...Dirk Dougherty2013-04-153-174/+703
| | |\ \
| | | * \ am 25afd5d0: am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.Dirk Dougherty2013-04-153-174/+703
| | | |\ \
| | | | * \ am d1dc8c70: am c6af49ef: Doc change: Add tablet basic checks.Dirk Dougherty2013-04-153-174/+703
| | | | |\ \
| | | | | * \ am c6af49ef: Doc change: Add tablet basic checks.Dirk Dougherty2013-04-153-174/+703
| | | | | |\ \
| | | | | | * | Doc change: Add tablet basic checks.Dirk Dougherty2013-04-153-174/+703
* | | | | | | | Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-sho...Stan Chesnutt2013-04-161-7/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Re-introduce single-shot mode, set MS Assist Mode A when inStan Chesnutt2013-04-151-7/+52
* | | | | | | | | Merge "Further reduce memory usage of notification archive." into jb-mr2-devDaniel Sandler2013-04-161-1/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Further reduce memory usage of notification archive.Daniel Sandler2013-04-161-1/+28
* | | | | | | | | | Merge "Finish annotating Notification.extras." into jb-mr2-devDaniel Sandler2013-04-162-33/+155
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Finish annotating Notification.extras.Daniel Sandler2013-04-152-33/+155
* | | | | | | | | | Merge "Fix for bug 8607049: Improve javascript dialogs for classic" into jb-m...Kristian Monsen2013-04-154-229/+213
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix for bug 8607049: Improve javascript dialogs for classicKristian Monsen2013-04-154-229/+213
* | | | | | | | | | | Merge "Fix security issues with LocationManager where apps with coarse permis...David Christie2013-04-151-3/+45
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix security issues with LocationManager where apps with coarse permissionsDavid Christie2013-04-151-3/+45
* | | | | | | | | | | | Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create......Dianne Hackborn2013-04-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Maybe fix issue #8620910: Win_sdk build failed and unable to create...Dianne Hackborn2013-04-151-0/+2
* | | | | | | | | | | | | Merge "Fix issue #8512015: VideoView's window animates when its position chan...Dianne Hackborn2013-04-153-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix issue #8512015: VideoView's window animates when its position changesDianne Hackborn2013-04-153-0/+9
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Add logic to handle changes to file_contexts during update." into jb-m...Geremy Condra2013-04-152-11/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add logic to handle changes to file_contexts during update.Geremy Condra2013-04-152-11/+110
* | | | | | | | | | | | | | Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-devIrfan Sheriff2013-04-151-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix CTS failure due to invalid EAP updateIrfan Sheriff2013-04-151-1/+2
* | | | | | | | | | | | | | | am edf2ab16: am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80:...Dirk Dougherty2013-04-1521-83/+1217
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: ...Dirk Dougherty2013-04-1521-83/+1217
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy gu...Dirk Dougherty2013-04-1521-83/+1217
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines docu...Dirk Dougherty2013-04-1521-83/+1217
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.Dirk Dougherty2013-04-1521-83/+1217
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | am 99a79e80: Doc change: add policy guidelines documents.Dirk Dougherty2013-04-1521-83/+1217
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|/ / | | | | | | |/| | | | | | | |
| | | | | | * | | | | | | | | Doc change: add policy guidelines documents.Dirk Dougherty2013-04-1221-83/+1217
* | | | | | | | | | | | | | | Merge "keystore: remove old APIs" into jb-mr2-devKenny Root2013-04-151-24/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | keystore: remove old APIsKenny Root2013-04-121-24/+0
* | | | | | | | | | | | | | | | Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-devSvetoslav2013-04-151-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Crash on non-eng builds due to lacking null check.Svetoslav2013-04-151-1/+3
* | | | | | | | | | | | | | | | | Merge "Fully setup newly bound service before state management." into jb-mr2-devSvetoslav2013-04-151-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fully setup newly bound service before state management.Svetoslav2013-04-151-3/+5
* | | | | | | | | | | | | | | | | Merge "Draw Operation merging" into jb-mr2-devChris Craik2013-04-1512-176/+627
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Draw Operation mergingChris Craik2013-04-1512-176/+627
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-devBrian Colonna2013-04-153-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Enabling Face Unlock for user switching (bug 8495282)Brian Colonna2013-04-153-4/+22
* | | | | | | | | | | | | | | | | | Merge "Allow non-system apps to use restricted accounts" into jb-mr2-devAmith Yamasani2013-04-152-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Allow non-system apps to use restricted accountsAmith Yamasani2013-04-152-6/+7
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Clarify how release of offline keys is handled in the MediaDrm API" in...Jeff Tinker2013-04-151-14/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Clarify how release of offline keys is handled in the MediaDrm APIJeff Tinker2013-04-121-14/+21
* | | | | | | | | | | | | | | | | | Merge "Remove old KeyStore call sites" into jb-mr2-devKenny Root2013-04-153-122/+180
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |