Merge "adb: rename \'flag\' to something less meaningless."
am: ff2e26b239

* commit 'ff2e26b239e931236c9acecdc2a22d540b3e0c3d':
  adb: rename 'flag' to something less meaningless.