commit | 7fce0a78a70cb7178b8f116bb6ac96f0a7d1170b | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 22 19:59:01 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 19:59:01 2015 +0000 |
tree | 46d5567b2ac4dbb3a230df5a6432c882272a862c | |
parent | a76ed9b1b68b9729999e4d7388602bc717917621 [diff] | |
parent | 2679e70fb93a22114163e4c762061e09af0d6847 [diff] |
am 2679e70f: am 320ffd89: am 8a6889c5: am aac28857: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev automerge: fcd7cb7 automerge: c73d810 * commit '2679e70fb93a22114163e4c762061e09af0d6847':