commit | 43f50ddf7c03493f1543e871c7e730e15ad1e569 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 29 04:06:40 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 04:06:40 2015 +0000 |
tree | fde5befa2e4f4ba0aec0c0a8ca475319291654a4 | |
parent | 7dc69404c24a24f65a61f1b68e2f0d21c352adc4 [diff] | |
parent | b0e65b8b6f85d7a0abb2ff2f4c4187f61f16c47b [diff] |
am b0e65b8b: am cefcf8e1: am 30c51aa1: am f8b940fe: am b553f3c2: am ec90764f: am 1b331600: am bc84bc01: am 199a3b58: Merge "Revert "Fix for ByodFlowTestActivity"" into lollipop-mr1-cts-dev * commit 'b0e65b8b6f85d7a0abb2ff2f4c4187f61f16c47b': Revert "Fix for ByodFlowTestActivity"