| commit | 068cb36877144dc337766c1113250f5ebc2cbf6f | [log] [tgz] |
|---|---|---|
| author | Eric Gilmore <egilmore@google.com> | Mon Oct 27 17:15:23 2014 -0700 |
| committer | Eric Gilmore <egilmore@google.com> | Mon Oct 27 17:15:23 2014 -0700 |
| tree | 3ce186b93decb633f98639a7f85dc7dfd3c983f6 | |
| parent | a9d803e0f7efe4c899ea37a50653452edb6d77fd [diff] | |
| parent | a4eb81b67cc5fb88f398d2b0d6523deed995a0ad [diff] |
Merge commit 'a4eb81b' into klp-modular-dev-plus-aosp Conflicts: docs/html/guide/topics/connectivity/nfc/nfc.jd