OSDN Git Service

Merge \"Fix nesting of sample XML code in complex-resources doc\" into nyc-mr1-dev
authorAdam Lesinski <adamlesinski@google.com>
Thu, 28 Jul 2016 19:23:13 +0000 (19:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 19:23:13 +0000 (19:23 +0000)
commitd70b8aa35e7ed250b2b175644af5913d67d30713
tree7ba7089097bc5ccd45c418a59cd8bd9d76bffcaf
parent6782ef9aa2eae388126d3e9fef1b2be8152e2f6a
parentc8c98ce254310aa5cf18316254c5bef2cfb79ff9
Merge \"Fix nesting of sample XML code in complex-resources doc\" into nyc-mr1-dev
am: c8c98ce254

Change-Id: Ib64593d75717353ff5693a7ad58eb9f87d4465fc