OSDN Git Service

Merge "Add "fixups" for ids referenced in code" am: f13f84fd9f am: 2ccb5bfecb
authorDavid Sehr <sehr@google.com>
Fri, 7 Oct 2016 15:19:55 +0000 (15:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Oct 2016 15:19:55 +0000 (15:19 +0000)
am: fccfede79f

Change-Id: I2a984f15d43c2f5df2376730b515e4da8dc82a1a


Trivial merge