| commit | 658ea19b9838c0213108d72831ef1b49e8480756 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Sep 30 02:49:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 02:49:18 2015 +0000 |
| tree | fed89b0af4a2720ce1468a1e07682410ee92c3d7 | |
| parent | e20fc935e389a014a67e72d166b776b3bb736d71 [diff] | |
| parent | cf6125722712cdb11cf4f62482c06f66a2fc72e9 [diff] |
am cf612572: (-s ours) Merge "DO NOT MERGE: Revert "Revert "Fix for ByodFlowTestActivity""" into lollipop-mr1-cts-dev * commit 'cf6125722712cdb11cf4f62482c06f66a2fc72e9': DO NOT MERGE: Revert "Revert "Fix for ByodFlowTestActivity""