diff options
| author | Andrew Solovay <asolovay@google.com> | 2016-04-01 18:46:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-01 18:46:28 +0000 |
| commit | 0015bf01804a81da198b9c3e0224f92a2b9d2c1a (patch) | |
| tree | d8593e08b9226c40f2eb606d42e15437717b5116 /tools/aapt2/diff/Diff.cpp | |
| parent | f4658e26cf77f16035415be30f0f2213ff6645f4 (diff) | |
| parent | 242f06cd6754069e35f255945cfa602f93ce3fb2 (diff) | |
Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs
am: 242f06cd
* commit '242f06cd6754069e35f255945cfa602f93ce3fb2':
Revert "Updates for Play" April Fool's joke.
Change-Id: I97a999693f4f181bf567a14021e3dcd55a63252b
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions