summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unused imports from frameworks/base.John Spurlock2013-11-20491-1329/+0
* am c8ea38fe: am e3705342: am b0183f0a: Harden against transiently unavailable...Christopher Tate2013-11-193-73/+202
|\
| * am e3705342: am b0183f0a: Harden against transiently unavailable backup trans...Christopher Tate2013-11-193-73/+202
| |\
| | * am b0183f0a: Harden against transiently unavailable backup transportsChristopher Tate2013-11-193-73/+202
| | |\
| | | * Harden against transiently unavailable backup transportsChristopher Tate2013-11-193-73/+202
* | | | am f52450b1: am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-...Joe Fernandez2013-11-195-74/+398
|\ \ \ \ | |/ / /
| * | | am dcf78a05: am de4a8d85: Merge "Systrace doc updates" into klp-docsJoe Fernandez2013-11-195-74/+398
| |\ \ \ | | |/ /
| | * | am de4a8d85: Merge "Systrace doc updates" into klp-docsJoe Fernandez2013-11-195-74/+398
| | |\ \
| | | * \ Merge "Systrace doc updates" into klp-docsJoe Fernandez2013-11-195-74/+398
| | | |\ \
| | | | * | Systrace doc updatesJoe Fernandez2013-11-195-74/+398
* | | | | | Merge "Refactor WifiEnterpriseConfig and move service part in WifiConfigStore"Vinit Deshapnde2013-11-192-338/+376
|\ \ \ \ \ \
| * | | | | | Refactor WifiEnterpriseConfig and move service part in WifiConfigStoreVinit Deshapnde2013-11-072-338/+376
* | | | | | | Merge "Fix logic problems in AnimationDrawable and View."John Spurlock2013-11-193-9/+10
|\ \ \ \ \ \ \
| * | | | | | | Fix logic problems in AnimationDrawable and View.John Spurlock2013-11-183-9/+10
* | | | | | | | am 741c9c74: am d220d820: am c04aa87e: Merge "Fix incorrent page range parsin...Dave Langemak2013-11-191-3/+7
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am d220d820: am c04aa87e: Merge "Fix incorrent page range parsing when custom...Dave Langemak2013-11-191-3/+7
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am c04aa87e: Merge "Fix incorrent page range parsing when custom print option...Dave Langemak2013-11-191-3/+7
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge "Fix incorrent page range parsing when custom print options used." into...Dave Langemak2013-11-191-3/+7
| | | |\ \ \ \ \
| | | | * | | | | Fix incorrent page range parsing when custom print options used.Svetoslav Ganov2013-11-151-3/+7
* | | | | | | | | am 8ef1c531: am be462aff: am 096de3c3: Merge "Notify apps when insets change....Craig Mautner2013-11-194-12/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am be462aff: am 096de3c3: Merge "Notify apps when insets change." into klp-devCraig Mautner2013-11-194-12/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 096de3c3: Merge "Notify apps when insets change." into klp-devCraig Mautner2013-11-194-12/+16
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Notify apps when insets change." into klp-devCraig Mautner2013-11-194-12/+16
| | | |\ \ \ \ \ \
| | | | * | | | | | Notify apps when insets change.Craig Mautner2013-11-184-12/+16
* | | | | | | | | | am 37ba54ac: am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent...Jeff Sharkey2013-11-192-1/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am eb4dc749: am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." ...Jeff Sharkey2013-11-192-1/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 6d0d4b5b: Merge "Mask OOBE when filtering recent documents." into klp-devJeff Sharkey2013-11-192-1/+5
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "Mask OOBE when filtering recent documents." into klp-devJeff Sharkey2013-11-192-1/+5
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Mask OOBE when filtering recent documents.Jeff Sharkey2013-11-182-1/+5
* | | | | | | | | | | am a9249322: am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." int...Sascha Prueter2013-11-183-170/+70
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-devSascha Prueter2013-11-183-170/+70
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am f7044fec: Merge "Trying to unbreak build..." into klp-devSascha Prueter2013-11-183-170/+70
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "Trying to unbreak build..." into klp-devSascha Prueter2013-11-193-170/+70
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Trying to unbreak build...Sascha Prueter2013-11-193-170/+70
* | | | | | | | | | | | am fa331b1d: am 1e964ed8: am d6bbc544: Merge "Harden against transiently unav...Christopher Tate2013-11-183-70/+170
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backu...Christopher Tate2013-11-183-70/+170
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am d6bbc544: Merge "Harden against transiently unavailable backup transports"...Christopher Tate2013-11-183-70/+170
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Harden against transiently unavailable backup transports" into klp-devChristopher Tate2013-11-193-70/+170
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Harden against transiently unavailable backup transportsChristopher Tate2013-11-183-70/+170
* | | | | | | | | | | | am 27927d5d: am 08ee31a2: am ce3f3a8d: Merge "Add link to HCE dev guide." int...Dirk Dougherty2013-11-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 08ee31a2: am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docsDirk Dougherty2013-11-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am ce3f3a8d: Merge "Add link to HCE dev guide." into klp-docsDirk Dougherty2013-11-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Add link to HCE dev guide." into klp-docsDirk Dougherty2013-11-191-1/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Add link to HCE dev guide.Dirk Dougherty2013-11-151-1/+1
* | | | | | | | | | | | | Merge "Revert "Expose new API for querying whether a certificate was user add...William Luh2013-11-192-14/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "Expose new API for querying whether a certificate was user added."William Luh2013-11-192-14/+0
* | | | | | | | | | | | | | am bdfa8a1a: (-s ours) am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate m...Deepanshu Gupta2013-11-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" i...Deepanshu Gupta2013-11-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-devDeepanshu Gupta2013-11-181-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-devDeepanshu Gupta2013-11-191-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |