commit | aa2503c1d2865af98dbd2c8e8626e5d75900da0a | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:20:52 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:20:52 2015 +0000 |
tree | 98509ed57ed5de37df6e0e64ba266e75c156c743 | |
parent | 2b019876f0bf1f7d557365a93c55bf15840bc08e [diff] | |
parent | 40bbe34a18f08f770502ef47434b3a8680be6b6e [diff] |
am 40bbe34a: am 7fce0a78: 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: c73d8 * commit '40bbe34a18f08f770502ef47434b3a8680be6b6e':