| commit | 8a3dd00f2302fa3bac1ea81f4e6dceea6fae9a3b | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Thu Aug 27 05:02:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:02:24 2015 +0000 |
| tree | 5bc92de6f453a0652b1965bdc90e8a78a42a1fcc | |
| parent | 41374088f5ba4938885d9bae299309ba81e52bab [diff] | |
| parent | 3f7c5424dbbf5b827ed912a5383bdc31dced7cec [diff] |
am 3f7c5424: (-s ours) am 2b2c9dff: am 4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml" * commit '3f7c5424dbbf5b827ed912a5383bdc31dced7cec':