| commit | 3c60243aaf5e0b85cf397cc47ba706bd252af03d | [log] [tgz] |
|---|---|---|
| author | Cheryl Potter <cherylpotter@google.com> | Wed Apr 27 00:36:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 27 00:36:19 2016 +0000 |
| tree | 19437d36c189d5aae157e212f165d5731b26f97e | |
| parent | 38429fe4a604ed352dbf9f666a0380fbc9b008c0 [diff] | |
| parent | 49d7803f046e8e71a473ff1a096ab1e1d6969bcc [diff] |
resolve merge conflicts of 946609b to nyc-dev am: 49d7803 * commit '49d7803f046e8e71a473ff1a096ab1e1d6969bcc': docs: AVD Manager docs for AS 2.0 b/26907919 Change-Id: Ic6596e94afa44e5afbf7aeed644b8f5571d5fd7f