diff options
| author | Alexander Hills <ahills@google.com> | 2016-06-15 16:02:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-15 16:02:48 +0000 |
| commit | 7816efa6afd579aa32cfb5f93e8454d7cc0db70f (patch) | |
| tree | 85539026ba1dafa176e02b6a84d0431a8d70a55a /tools/aapt2/diff/Diff.cpp | |
| parent | b6a19b1ce16372ff0ef43f3da7219b458790c416 (diff) | |
| parent | 9f08761f08925bc4978a45c2c8f8e224c14c3336 (diff) | |
Merge "Adds a flag to Action.WearableExtender to display actions inline on Wear" into nyc-mr1-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions