commit | a308f25d14bdb48e105d55a314558d8918c8984d | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Jun 30 17:57:30 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 17:57:30 2015 +0000 |
tree | 55db9dbd8d207cba0c6d8a3d81dc8aa9385e3ffd | |
parent | 98c72beb701513ee7108a34201c1e4ff774db9d6 [diff] | |
parent | b0f079c04e5a0708f393a49fa5f5f1f977ef01fa [diff] |
am b0f079c0: am b1c0dd86: am 485ce740: am 041a618b: am b3877999: am 8dab941b: Merge "Fix race condition in testSendOrderedBroadcast1" into lollipop-cts-dev automerge: 306cf94 * commit 'b0f079c04e5a0708f393a49fa5f5f1f977ef01fa': Fix race condition in testSendOrderedBroadcast1