ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
eed845539a
replicant-frameworks_native/include/android
History
Ricardo Cerqueira 1cdd1b5ad2 Android 6.0.0 release 26 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgIACgkQ6K0/gZqxDnjCqACfbBT6VOiUFQvRn7w1SAa+4rjF
 1IwAn2rBUqWo0dOKVwF1DDfFmGZXc8SB
 =1BqV
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

Conflicts:
	include/android/input.h

Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
2015-11-05 01:41:42 +00:00
..
asset_manager_jni.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00
asset_manager.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00
bitmap.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00
configuration.h Merge commit '217a04ba' into manualmerge 2015-05-18 15:19:30 -07:00
input.h Android 6.0.0 release 26 2015-11-05 01:41:42 +00:00
keycodes.h DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev" 2015-09-22 22:05:48 +01:00
looper.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00
multinetwork.h multinetwork API: native header 2015-04-07 12:18:25 +09:00
native_activity.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00
native_window_jni.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00
native_window.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00
obb.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00
rect.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00
sensor.h resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp 2015-05-13 09:10:17 -07:00
storage_manager.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00
trace.h Add tracing header 2015-06-10 13:10:47 -07:00
window.h frameworks/native: document native types and enums 2015-05-12 14:39:28 -07:00