| commit | f3a0e50547a446c88c027100f899880e82bbf7ce | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 30 03:03:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 03:03:37 2015 +0000 |
| tree | 21678ca25ac653006629b737234db5dc16546620 | |
| parent | 1004ed31460cb5b1c40ba1a584b96e34e3ced3cc [diff] | |
| parent | 5012608d72fa1da9784a8c63fecb491c43361ccc [diff] |
am 5012608d: (-s ours) am d519d714: am 658ea19b: am cf612572: (-s ours) Merge "DO NOT MERGE: Revert "Revert "Fix for ByodFlowTestActivity""" into lollipop-mr1-cts-dev * commit '5012608d72fa1da9784a8c63fecb491c43361ccc': DO NOT MERGE: Revert "Revert "Fix for ByodFlowTestActivity""