| commit | b1bd0ed1a474abedfe648ed915bef99ca8a28d49 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri May 27 23:05:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 27 23:05:29 2016 +0000 |
| tree | c37b2c92a3d398430f01915db33e1090818bae4e | |
| parent | 6a1fadc95779785880e6d36bbc89eabead712dcb [diff] | |
| parent | 8b3bab8fd7b107dfce12e9775879650828b423fe [diff] |
resolve merge conflicts of 91ed21a to nyc-dev-plus-aosp am: 70ca8dcb0b am: 3ace495a5d * commit '3ace495a5da92d4e0423d8f8a55d7efe2f325d05': [adb] Issue the "auth" emulator command before any other one Change-Id: I67310a37243ac834c12386359771af4f2de82ab7