tree 38c7824dae78a4f83bb27888c17a03cf27a3806c
parent 4496f985fac9280d49a69a492d0faac816c3f695
parent 048f4aa7f136d30d6782173367463823557d7c8e
author Martijn Coenen <maco@google.com> 1442906550 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1442906550 +0000

Merge "NFC compatibility changes." into mnc-dev