commit | 93542c68d9126a3bbf0605d26f7c92e57e2d2cbb | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Fri Jul 29 02:33:13 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 29 02:33:13 2016 +0000 |
tree | 021cd15fdace1342263dda0c30aadf20dca7487a | |
parent | 98e1c43d7ba451b0994f1ed68cea41b1b12337cb [diff] | |
parent | e1455eb5ffc80c649696daf92f3277d246ed1c5b [diff] |
Merge \\\"Fix nesting of sample XML code in complex-resources doc\\\" into nyc-mr1-dev am: c8c98ce254 am: d70b8aa35e am: e1455eb5ff Change-Id: I43ad798d16774555f66c809c272ac9774b2daeee