resolve merge conflicts of 91ed21a to nyc-dev-plus-aosp

Browse source

am: 70ca8dcb0b

* commit '70ca8dcb0b1753778ac373a16c9b0f275ee14ce9':
  [adb] Issue the "auth" emulator command before any other one

Change-Id: I77856dee30b17497fd94af9e0aa527d93ba25681

...

This commit is contained in:

Yurii Zubrytskyi 2016-05-27 22:00:07 +00:00 • committed by android-build-merger

parent bcd4058f47 70ca8dcb0b

commit 3ace495a5d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available