| commit | f0f67e6af93a601546b1d915b147dda5da295a1f | [log] [tgz] |
|---|---|---|
| author | Griff Hazen <griff@google.com> | Thu Aug 28 17:02:50 2014 -0700 |
| committer | Griff Hazen <griff@google.com> | Thu Aug 28 17:02:50 2014 -0700 |
| tree | df164659f77c7cbc5d9b069c6deb15ef2a51803f | |
| parent | 0f519a9e5ede300ba9fe5f307700585d33564982 [diff] | |
| parent | 38014a7c819ae81bbc5f92b0f43ebd464faa4a97 [diff] |
Merge commit '38014a7c' into lmp-dev Conflicts: include/hardware/sensors.h Change-Id: I21517f717761af7f52c003d535e86059ebb75f05