OSDN Git Service

resolve merge conflicts of 946609b to nyc-dev
authorCheryl Potter <cherylpotter@google.com>
Wed, 27 Apr 2016 00:36:16 +0000 (00:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Apr 2016 00:36:16 +0000 (00:36 +0000)
commitb49856af5a2320b53a4031ed3eaac587ef1b946f
tree4e6be572601a5230d3759412a0b49973b163db67
parent7c82c92051e81e59aafee84aa62cf58f3396dcaf
parent49d7803f046e8e71a473ff1a096ab1e1d6969bcc
resolve merge conflicts of 946609b to nyc-dev
am: 49d7803

* commit '49d7803f046e8e71a473ff1a096ab1e1d6969bcc':
  docs: AVD Manager docs for AS 2.0 b/26907919

Change-Id: Ib5c2b342783ec9ab91e61cb60aa5fc979a9a0425