OSDN Git Service

resolve merge conflicts of 7829131 to nyc-dev
authorsmain@google.com <smain@google.com>
Mon, 2 May 2016 21:09:52 +0000 (14:09 -0700)
committersmain@google.com <smain@google.com>
Mon, 2 May 2016 21:09:52 +0000 (14:09 -0700)
commit0f3e8956619f11fc63dc6b849f057a8054ea2c23
tree54cd9b9e25bf6021bbecaa765a9f638e531c2a70
parent7cae9f7bbc0ee78c1e9c6758db3bcf8fcd815c2b
parent782913190bf9d1c293f1d7fad43dd3030e927095
resolve merge conflicts of 7829131 to nyc-dev

Change-Id: I9e995ea0b6d7a8758ba37f171240b53182a31fed
docs/html/adk/adk2.jd