commit | 8b3bab8fd7b107dfce12e9775879650828b423fe | [log] [tgz] |
---|---|---|
author | Yurii Zubrytskyi <zyy@google.com> | Fri May 27 22:00:07 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 27 22:00:07 2016 +0000 |
tree | d5550ff51992fb9628f716576c2d0fb364855aab | |
parent | 3654dae55f0643fc02684b11414b93a0947e833d [diff] | |
parent | 82729eb47ed206cb9a26d4e009a7affa3774ddc7 [diff] |
resolve merge conflicts of 91ed21a to nyc-dev-plus-aosp am: 70ca8dcb0b * commit '70ca8dcb0b1753778ac373a16c9b0f275ee14ce9': [adb] Issue the "auth" emulator command before any other one Change-Id: I77856dee30b17497fd94af9e0aa527d93ba25681