Kenny Root a43a0d76a4 resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp ... Change-Id: Ibb4a2058e585218bdeaf4c1d568093fbbd8f6478		2015-05-13 09:10:17 -07:00
..
asset_manager.h	frameworks/native: document native types and enums	2015-05-12 14:39:28 -07:00
asset_manager_jni.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	frameworks/native: document native types and enums	2015-05-12 14:39:28 -07:00
input.h	frameworks/native: document native types and enums	2015-05-12 14:39:28 -07:00
keycodes.h	resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp	2015-05-13 09:10:17 -07: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.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
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
window.h	frameworks/native: document native types and enums	2015-05-12 14:39:28 -07:00