| commit | bc84bc0125c08228ad9cd75450c2bb6766dec46a | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 29 03:18:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 03:18:57 2015 +0000 |
| tree | ed5e5914d3122daf86a30fa530f49dc2173e8d60 | |
| parent | b5c400718b33a5741b177bfe060363cc4abd63c5 [diff] | |
| parent | 199a3b5827a37f68797ca98e00a49c94b322491f [diff] |
am 199a3b58: Merge "Revert "Fix for ByodFlowTestActivity"" into lollipop-mr1-cts-dev * commit '199a3b5827a37f68797ca98e00a49c94b322491f': Revert "Fix for ByodFlowTestActivity"