commit | cea8f44ea5a1f7b861529e4162c3691cf1469ba4 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Mon Sep 28 22:26:13 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 28 22:26:13 2015 +0000 |
tree | 041af432facce2e2588f7bbbc0ce59eecb235c51 | |
parent | 48623d65e5051d4456fba1b6fef0f0ebb915fcdc [diff] | |
parent | 3f4d57b167404bc260bad1b5cf873cc73fc0e53f [diff] |
am 3f4d57b1: am 582b2fd8: am efc000c4: Merge "Fix for ByodFlowTestActivity" into lollipop-mr1-cts-dev * commit '3f4d57b167404bc260bad1b5cf873cc73fc0e53f': Fix for ByodFlowTestActivity