Skip to content
Commit adb87ec5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'frankenbuild' into oc-dev 

* changes:
  Revert "Resource ID fixup."
  Resource ID fixup.
parents e497b698 14a2cb94
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment