OSDN Git Service

Merge changes from topic 'frankenbuild' into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 2 May 2017 23:59:46 +0000 (23:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 May 2017 23:59:50 +0000 (23:59 +0000)
* changes:
  Revert "Resource ID fixup."
  Resource ID fixup.


Trivial merge