tree 6154dfbf85bedab573c70d3cab4a492a68b2a51c
parent 4364bae74d28d77b1e52f3d82c9291e927646e13
parent a5a00b6e0df7b0074030d830bf1c5048e7fe038e
author Keun Soo Yim <yim@google.com> 1476407016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1476407017 +0000

Merge "add NFC component_type"