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