OSDN Git Service

resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp
authorKenny Root <kroot@google.com>
Wed, 13 May 2015 16:10:17 +0000 (09:10 -0700)
committerKenny Root <kroot@google.com>
Wed, 13 May 2015 16:10:17 +0000 (09:10 -0700)
commita43a0d76a4fc08251c76c9c5cf5f3b9243b624eb
tree35561a6db940ba19f614184c1d21f943a2b4105e
parentcfc35342441dd0151cc523f178384a6eae6d6c7e
parent91e485fad1fb3dc5d1c5f8fa323c22f2c5d9b960
resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp

Change-Id: Ibb4a2058e585218bdeaf4c1d568093fbbd8f6478
include/android/keycodes.h
include/android/sensor.h