tree 7dc911e6ec862e5ef8a9023ac9cebdeded10b4d2
parent 716475daa1562b9a7cd950215d83364756ef065a
parent 417ee5ba89f7e0fe5efd34fce74bf1ee5923d976
author Tor Norbye <tnorbye@google.com> 1426540830 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1426540831 +0000

Merge "Add resource type annotations to some APIs"