| commit | 9167561797c46142eb7eeba6af154c9ad4aefda8 | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Tue Jun 30 15:27:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 15:27:51 2015 +0000 |
| tree | 73901e71a3ddfcf186e51b16c22d160c13f46f57 | |
| parent | a7aebe0b8220ea072845376bb84179967d28bde9 [diff] | |
| parent | 6137e931f9b61a44837280d16e81aba26424cdbb [diff] |
am 4954aff5: Merge "resolved conflicts for merge of e89d821e to mnc-dev" into mnc-dev * commit '4954aff536d4fcf163f410fa83fca30dc9fde4ca': Dump of previous vibrations.