tree 7ba7089097bc5ccd45c418a59cd8bd9d76bffcaf
parent 0a39c8f1c94e29dad31cfa1d48a0fd43da5cc73a
parent 4d1e2adf60fc99f76a9814eeb58c7d2d98bc4699
author Adam Lesinski <adamlesinski@google.com> 1469732775 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1469732777 +0000

Merge "Fix nesting of sample XML code in complex-resources doc" into nyc-mr1-dev