OSDN Git Service

Merge \\"Fix nesting of sample XML code in complex-resources doc\\" into nyc-mr1...
authorAdam Lesinski <adamlesinski@google.com>
Thu, 28 Jul 2016 19:40:44 +0000 (19:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 19:40:44 +0000 (19:40 +0000)
commite1455eb5ffc80c649696daf92f3277d246ed1c5b
tree8295370f58dbd5a8347f905ea24e5e31d984ee1a
parent4b9a4ed9a85a0b5318e94a34d004d0d76bbecdf8
parentd70b8aa35e7ed250b2b175644af5913d67d30713
Merge \\"Fix nesting of sample XML code in complex-resources doc\\" into nyc-mr1-dev am: c8c98ce254
am: d70b8aa35e

Change-Id: I85c43c7e9ce1160e19762e5cafe297d389ec5ecc