tree 9e42e3f36cb98d80f3cc8daac40373580fbcc7df
parent f9b78bb69db70a7b10d38ed958baf24ba96d1380
parent 4c44359d91c4b364a650799e93580eb5a066de7f
author Adam Lesinski <adamlesinski@google.com> 1455647667 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1455647668 +0000

Merge "Fix up some small resource issues" into nyc-dev