diff options
| author | Christoph Studer <chstuder@google.com> | 2014-12-16 18:31:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 18:31:53 +0000 |
| commit | 2bd62b53b68834cabb48be608ee350012b1e8043 (patch) | |
| tree | 9943aea261e886d37bd20fdf1aafffc1a4958e7c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | ea12691338cba1d3b6547b6eefb52388f1ed4a28 (diff) | |
| parent | 88fb463ea355303f03535a29ac5935bf69d8a50e (diff) | |
am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev
* commit '88fb463ea355303f03535a29ac5935bf69d8a50e':
Fix MediaStyle docs mentioning 2 max actions in compact view
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions