summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* am a937b013: am 184b17dd: Merge "Camera2: Add a missing key for controlling s...Eino-Ville Talvala2013-09-122-0/+30
|\
| * am 184b17dd: Merge "Camera2: Add a missing key for controlling shading map mo...Eino-Ville Talvala2013-09-122-0/+30
| |\
| | * Merge "Camera2: Add a missing key for controlling shading map mode" into klp-devEino-Ville Talvala2013-09-122-0/+30
| | |\
| | | * Camera2: Add a missing key for controlling shading map modeEino-Ville Talvala2013-09-122-0/+30
* | | | am ddc74f5e: am 6c621639: Merge "camera_metadata: add android.lens.state MOVI...Igor Murashkin2013-09-122-0/+6
|\ \ \ \ | |/ / /
| * | | am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value...Igor Murashkin2013-09-122-0/+6
| |\ \ \ | | |/ /
| | * | Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-devIgor Murashkin2013-09-122-0/+6
| | |\ \
| | | * | camera_metadata: add android.lens.state MOVING enum valueIgor Murashkin2013-09-112-0/+6
* | | | | am 913c0233: am c0f65209: Merge "Add exclude() methods to Transition" into kl...Chet Haase2013-09-123-25/+332
|\ \ \ \ \ | |/ / / /
| * | | | am c0f65209: Merge "Add exclude() methods to Transition" into klp-devChet Haase2013-09-123-25/+332
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add exclude() methods to Transition" into klp-devChet Haase2013-09-123-25/+332
| | |\ \ \
| | | * | | Add exclude() methods to TransitionChet Haase2013-09-113-25/+332
* | | | | | am c3414dc4: am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable ref...Jeff Sharkey2013-09-122-22/+72
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 357f9e34: Merge "Handle pipe thumbnails, acquire unstable refs." into klp-devJeff Sharkey2013-09-122-22/+72
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Handle pipe thumbnails, acquire unstable refs." into klp-devJeff Sharkey2013-09-122-22/+72
| | |\ \ \ \
| | | * | | | Handle pipe thumbnails, acquire unstable refs.Jeff Sharkey2013-09-112-22/+72
* | | | | | | am 3f36b33d: am b25cfdf1: Merge "Document the order of values returned by key...Flavio Lerda2013-09-126-6/+108
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b25cfdf1: Merge "Document the order of values returned by keyAt()." into k...Flavio Lerda2013-09-126-6/+108
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Document the order of values returned by keyAt()." into klp-devFlavio Lerda2013-09-126-6/+108
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Document the order of values returned by keyAt().Flavio Lerda2013-09-086-6/+108
* | | | | | | Merge "Adding freeMemoryForTests static method to WebView."Primiano Tucci2013-09-123-0/+19
|\ \ \ \ \ \ \
| * | | | | | | Adding freeMemoryForTests static method to WebView.Primiano Tucci2013-09-123-0/+19
* | | | | | | | am 6d6c5de1: am 03ad7ae1: Merge "consumer ir: clarify @link in documentation"...Alex Ray2013-09-111-4/+7
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 03ad7ae1: Merge "consumer ir: clarify @link in documentation" into klp-devAlex Ray2013-09-111-4/+7
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "consumer ir: clarify @link in documentation" into klp-devAlex Ray2013-09-121-4/+7
| | |\ \ \ \ \ \
| | | * | | | | | consumer ir: clarify @link in documentationAlex Ray2013-09-111-4/+7
| | | | |_|_|/ / | | | |/| | | |
* | | | | | | | am fb09a738: am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-devEino-Ville Talvala2013-09-1115-905/+1345
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am ede3eeb7: Merge changes Ia6300c23,Idd2ae8ad into klp-devEino-Ville Talvala2013-09-1115-905/+1345
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge changes Ia6300c23,Idd2ae8ad into klp-devEino-Ville Talvala2013-09-1215-905/+1345
| | |\ \ \ \ \ \
| | | * | | | | | Camera2: Immutable metadataEino-Ville Talvala2013-09-1115-763/+920
| | | * | | | | | Camera2: Listener rework and other API updatesEino-Ville Talvala2013-09-114-151/+434
* | | | | | | | | am 2df0f9ed: am 442a8753: am c3415a91: Merge "Remove ArpPeer; dead code from ...Elliott Hughes2013-09-111-174/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 442a8753: am c3415a91: Merge "Remove ArpPeer; dead code from Google TV."Elliott Hughes2013-09-111-174/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am c3415a91: Merge "Remove ArpPeer; dead code from Google TV."Elliott Hughes2013-09-111-174/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge "Remove ArpPeer; dead code from Google TV."Elliott Hughes2013-09-111-174/+0
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Remove ArpPeer; dead code from Google TV.Elliott Hughes2013-09-111-174/+0
| | * | | | | | | | | | am 90e42717: Merge changes I5d2be3c5,I9017256bKenny Root2013-09-102-6/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Add argument to binder call to check key typesKenny Root2013-09-101-2/+3
| | | * | | | | | | | | Use hostname verifier directly instead of instanceKenny Root2013-09-101-4/+1
| | | |/ / / / / / / /
* | | | | | | | | | | am 21497c5f: am af2d8bbd: Merge "Scale feels too quick in relation to movemen...Mindy Pereira2013-09-111-5/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am af2d8bbd: Merge "Scale feels too quick in relation to movement" into klp-devMindy Pereira2013-09-111-5/+12
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Scale feels too quick in relation to movement" into klp-devMindy Pereira2013-09-111-5/+12
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | | * | | | | | | | Scale feels too quick in relation to movementMindy Pereira2013-09-091-5/+12
* | | | | | | | | | | am e2d76fa8: am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-devJeff Sharkey2013-09-112-10/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-devJeff Sharkey2013-09-112-10/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge changes Ib1274847,I2eb2a1bf into klp-devJeff Sharkey2013-09-112-10/+2
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | | * | | | | | | | Request all tethering interfaces, fix corruption.Jeff Sharkey2013-09-102-10/+2
* | | | | | | | | | | am 0494832f: am 706113fa: Merge "Improve some javadoc related to isProviderEn...Tom O'Neill2013-09-111-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 706113fa: Merge "Improve some javadoc related to isProviderEnabled() apis"...Tom O'Neill2013-09-111-4/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-devTom O'Neill2013-09-111-4/+9
| | |\ \ \ \ \ \ \ \ \