| commit | bfb910febbfd637f6f04aecc50183ad715e2256a | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Thu Aug 27 10:04:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:04:55 2015 +0000 |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
| parent | bb1c5fd71708dc0cf8967db51170c3d9437cdba2 [diff] | |
| parent | 46b7af57d7fd4354139801785a3eeb0579f4b6f9 [diff] |
am 46b7af57: (-s ours) am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev * commit '46b7af57d7fd4354139801785a3eeb0579f4b6f9':