OSDN Git Service

Merge commit 'a4eb81b' into klp-modular-dev-plus-aosp
authorEric Gilmore <egilmore@google.com>
Tue, 28 Oct 2014 00:15:23 +0000 (17:15 -0700)
committerEric Gilmore <egilmore@google.com>
Tue, 28 Oct 2014 00:15:23 +0000 (17:15 -0700)
commit068cb36877144dc337766c1113250f5ebc2cbf6f
tree3ce186b93decb633f98639a7f85dc7dfd3c983f6
parenta9d803e0f7efe4c899ea37a50653452edb6d77fd
parenta4eb81b67cc5fb88f398d2b0d6523deed995a0ad
Merge commit 'a4eb81b' into klp-modular-dev-plus-aosp

Conflicts:
docs/html/guide/topics/connectivity/nfc/nfc.jd