OSDN Git Service

Merge "docs: rewrite one attribute description in R.attr" into nyc-dev
authorMark Lu <marklu@google.com>
Fri, 26 Aug 2016 00:42:17 +0000 (00:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 00:42:17 +0000 (00:42 +0000)
am: 30cba33a60

Change-Id: I0e7579b2dbc58ac7cace74d6987ddfe257455197


Trivial merge