| commit | dd122b1ea2ec3f0b8c4230f8c0c1ca06799e4e19 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Aug 18 04:15:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 04:15:47 2015 +0000 |
| tree | e1f5f1d343cade91d8b5b91db5265e262f45fc4e | |
| parent | 57d78cda18c111d1d6f2f69fdbbc78f29f7b9eb7 [diff] | |
| parent | 014719fcfc240910fa216c39826b95d712468183 [diff] |
am 014719fc: resolved conflicts for merge of 05fae7e0 to mnc-dr-dev-plus-aosp * commit '014719fcfc240910fa216c39826b95d712468183': Use repeatable timestamps