| commit | 019554f6483a80524e27e64e8b1be6f9a125e32c | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Sep 01 16:49:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 16:49:33 2015 +0000 |
| tree | 49d5ada900011558c96edab2f3c39525bb745023 | |
| parent | a4820004000d41e8a9680db27013856cc18badf2 [diff] | |
| parent | 4b69cbd6e95da7a209f839804e0fef7494a15459 [diff] |
am 4b69cbd6: resolved conflicts for merge of 335e0e08 to mnc-dr-dev-plus-aosp * commit '4b69cbd6e95da7a209f839804e0fef7494a15459': include/android/sensor: add enum for LINEAR_ACCELERATION