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)
commitadb87ec50b10eed0212af9f9b670ece64e03e0ec
tree8a5b31d3f2dc8056823616fb9fa50eb7c6a4bfbe
parente497b698d2e7d123984cd95c9ac682de09ee82fa
parent14a2cb946fc4471a9a1f4d4c8f07ba67889765b9
Merge changes from topic 'frankenbuild' into oc-dev

* changes:
  Revert "Resource ID fixup."
  Resource ID fixup.