| commit | 3403adb9f8c91ccec8820656d3860e6c8ed46da8 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 15 21:19:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 21:19:35 2015 +0000 |
| tree | 73a509cb3d73847dd9b3182ef8ff616523a03af2 | |
| parent | 8ec7375a545fbfca4fab8b07cebd945c07a268c0 [diff] | |
| parent | 0f1fcb194443a0af39a46e49e4298c6ecfb7e884 [diff] |
am 0f1fcb19: am 6d9ae8eb: am 8eba2069: am a2cf50ca: am 955b1c3f: am 22dafe47: am bd524065: am c73d8100: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev automerge * commit '0f1fcb194443a0af39a46e49e4298c6ecfb7e884':