| commit | e1455eb5ffc80c649696daf92f3277d246ed1c5b | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Thu Jul 28 19:40:44 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 28 19:40:44 2016 +0000 |
| tree | 8295370f58dbd5a8347f905ea24e5e31d984ee1a | |
| parent | 4b9a4ed9a85a0b5318e94a34d004d0d76bbecdf8 [diff] | |
| parent | d70b8aa35e7ed250b2b175644af5913d67d30713 [diff] |
Merge \\"Fix nesting of sample XML code in complex-resources doc\\" into nyc-mr1-dev am: c8c98ce254 am: d70b8aa35e Change-Id: I85c43c7e9ce1160e19762e5cafe297d389ec5ecc