Steve Kondik a98331d1ae Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/native into cm-13.0 %!s(int64=9) %!d(string=hai) anos
..
asset_manager.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos
asset_manager_jni.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos
bitmap.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos
configuration.h 5f1dfc11b4 Merge commit '217a04ba' into manualmerge %!s(int64=9) %!d(string=hai) anos
input.h 1cdd1b5ad2 Merge tag 'android-6.0.0_r26' into HEAD %!s(int64=9) %!d(string=hai) anos
keycodes.h a180e855f6 Add KEYCODE_SOFT_SLEEP for Ungaze. %!s(int64=9) %!d(string=hai) anos
looper.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos
multinetwork.h 1a4b21e039 multinetwork API: native header %!s(int64=9) %!d(string=hai) anos
native_activity.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos
native_window.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos
native_window_jni.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos
obb.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos
rect.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos
sensor.h a43a0d76a4 resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp %!s(int64=9) %!d(string=hai) anos
storage_manager.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos
trace.h 6a40d678ea Add tracing header %!s(int64=9) %!d(string=hai) anos
window.h bf6d5e012c frameworks/native: document native types and enums %!s(int64=9) %!d(string=hai) anos