summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '62ec2dd5' into mmMichael Wright2015-08-072-1/+9
|\
| * DO NOT MERGE Add new media navigation keys.Michael Wright2015-08-072-1/+9
* | Merge "SF: Track missed frames and optionally drop them" into mnc-dr-devDan Stoza2015-08-052-6/+29
|\ \
| * | SF: Track missed frames and optionally drop themDan Stoza2015-07-232-6/+29
* | | am ea2afa46: Merge "Fix parsing of extension string" into mnc-devNaveen Leekha2015-08-031-9/+8
|\ \ \ | | |/ | |/|
| * | Merge "Fix parsing of extension string" into mnc-devNaveen Leekha2015-08-031-9/+8
| |\ \
| | * | Fix parsing of extension stringMichael Lentine2015-07-311-9/+8
* | | | am d87defaf: SF: Allow present if sideband stream changedDan Stoza2015-07-311-0/+4
|\ \ \ \ | |/ / /
| * | | SF: Allow present if sideband stream changedDan Stoza2015-07-291-0/+4
* | | | Bug fix in SensorManager.Aravind Akella2015-07-302-54/+61
* | | | am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-devNarayan Kamath2015-07-292-11/+4
|\ \ \ \ | |/ / /
| * | | Merge "Revert "Bug fix in SensorManager."" into mnc-devNarayan Kamath2015-07-292-11/+4
| |\ \ \
| | * | | Revert "Bug fix in SensorManager."Narayan Kamath2015-07-292-11/+4
* | | | | am 2376bd68: Merge "Bug fix in SensorManager." into mnc-devAravind Akella2015-07-292-4/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Bug fix in SensorManager." into mnc-devAravind Akella2015-07-292-4/+11
| |\ \ \ \ | | |/ / /
| | * | | Bug fix in SensorManager.Aravind Akella2015-07-262-4/+11
* | | | | am bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list...Jim Miller2015-07-241-0/+20
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-devJim Miller2015-07-241-0/+20
| |\ \ \ | | |_|/ | |/| |
| | * | Add FEATURE_FINGERPRINT to PackageManager's feature listJim Miller2015-07-241-0/+20
* | | | am 99426810: Merge "Check for the presence of accel and magnetometer sensors ...Chenjie Luo2015-07-221-2/+8
|\ \ \ \ | |/ / /
| * | | Merge "Check for the presence of accel and magnetometer sensors before adding...Chenjie Luo2015-07-221-2/+8
| |\ \ \ | | |/ / | |/| |
| | * | Check for the presence of accel and magnetometer sensors before adding AOSP f...Aravind Akella2015-07-201-2/+8
| | |/
* | | am f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit ...Lajos Molnar2015-07-211-10/+18
|\ \ \ | |/ /
| * | Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into ...Lajos Molnar2015-07-211-10/+18
| |\ \
| | * | omx: fix structure sizes to be the same on 32 and 64-bit buildsLajos Molnar2015-07-211-10/+18
| | |/
* | | am a2307aef: Only restorecon_data once for all users.Jeff Sharkey2015-07-201-4/+4
|\ \ \ | |/ /
| * | Only restorecon_data once for all users.Jeff Sharkey2015-07-201-4/+4
| |/
* | am 5f920c1a: BufferQueueConsumer: signal onFrameReleased on dropped framesLajos Molnar2015-07-171-129/+142
|\ \ | |/
| * BufferQueueConsumer: signal onFrameReleased on dropped framesLajos Molnar2015-07-171-129/+142
* | am c968c017: Installd: Add a swap override flagAndreas Gampe2015-07-171-7/+36
|\ \ | |/
| * Installd: Add a swap override flagAndreas Gampe2015-07-161-7/+36
* | Merge "Show charging speed on Keyguard" into mnc-dr-devAdrian Roos2015-07-142-0/+3
|\ \
| * | Show charging speed on KeyguardAdrian Roos2015-07-102-0/+3
* | | am fd549578: Merge "Cancel touches as well as pointer gestures." into mnc-devMichael Wright2015-07-140-0/+0
|\ \ \ | | |/ | |/|
| * | Merge "Cancel touches as well as pointer gestures." into mnc-devMichael Wright2015-07-142-5/+33
| |\ \
| | * | Cancel touches as well as pointer gestures.Michael Wright2015-07-132-5/+33
* | | | am 4904821b: Merge "Rename wakelock held internally by SensorService." into m...Aravind Akella2015-07-131-2/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "Rename wakelock held internally by SensorService." into mnc-devAravind Akella2015-07-131-2/+2
| |\ \ | | |/ | |/|
| | * Rename wakelock held internally by SensorService.Aravind Akella2015-07-101-2/+2
* | | am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to 570052f with hist...Qiwen Zhao2015-07-100-0/+0
|\ \ \ | |/ /
| * | DO NOT MERGE ANYWHERE. reset back to 570052f with history.Qiwen Zhao2015-07-090-0/+0
| |\ \ | |/ / |/| / | |/
* | Merge "Cancel touches as well as pointer gestures." into mnc-devMichael Wright2015-07-0925-310/+4102
|\ \ | |/ |/|
| * Cancel touches as well as pointer gestures.Michael Wright2015-07-092-5/+33
| * am 00078817: am 59a33a01: (-s ours) am dbc2d87a: Merge "Installd: Fix delete_...Narayan Kamath2015-07-010-0/+0
| |\
| | * am 59a33a01: (-s ours) am dbc2d87a: Merge "Installd: Fix delete_code_cache() ...Narayan Kamath2015-07-010-0/+0
| | |\
| | | * am dbc2d87a: Merge "Installd: Fix delete_code_cache() clearing the wrong cach...Narayan Kamath2015-07-011-1/+1
| | | |\
| | | | * Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"Narayan Kamath2015-07-011-1/+1
| | | | |\
| | | | | * Installd: Fix delete_code_cache() clearing the wrong cache dirHao Li2015-07-011-1/+1
| | | | |/
| * | | | am b5d6ec7c: am e59cb43e: Fix writeByteArray/writeInt32Array size on x64Chad Brubaker2015-06-301-4/+4
| |\ \ \ \ | | |/ / /
| | * | | am e59cb43e: Fix writeByteArray/writeInt32Array size on x64Chad Brubaker2015-06-301-4/+4
| | |\ \ \