tree a282b4f9e84f59c7e2b816330198358b6d2086bf
parent 300d6fd90c3b63948d86e140353604baa8339a34
parent 927369befd3c2b20de6611e4874f6522e119d8b4
author Martijn Coenen <maco@google.com> 1438176100 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1438176100 +0000

Merge "Add contactless symbol to NFC resources." into mnc-dev