| commit | 39c32ecf379adab1a54eaa0908e3993dffadcd00 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Tue Jun 23 18:13:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 23 18:13:15 2015 +0000 |
| tree | 7632fefbccb76181de554ab5b97e1a28f4c8c2ff | |
| parent | ccb52820d801172288bb84781d81f1a9604d44f8 [diff] | |
| parent | 7d3ad695304a1f24026227e630add6edd76fd0d6 [diff] |
am 7d3ad695: Merge commit \'71997c1a\' into manualmerge * commit '7d3ad695304a1f24026227e630add6edd76fd0d6': Add new AINPUT_SOURCE_BLUETOOTH_STYLUS