diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-29 20:38:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-29 20:38:20 +0000 |
| commit | 53c9898e7952b966b61b0c1d74ee1186a8057a47 (patch) | |
| tree | 4dda977e8de7ca5904a19d172ac9b242ce3e95b5 /tools/aapt2/Main.cpp | |
| parent | 5bb8294f926dcaf4a7288ba4457d84d57bb4ab53 (diff) | |
| parent | 360182156a8e188534620de1e804993a6458470d (diff) | |
Merge changes I446fb6ab,Ife3bbd29 into oc-dev
* changes:
Valid resource IDs may be negative
AAPT2: Workaround for findViewById with package ID > 0x7f
Diffstat (limited to 'tools/aapt2/Main.cpp')
| -rw-r--r-- | tools/aapt2/Main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp index 1965ad941b2e..01930d0c424b 100644 --- a/tools/aapt2/Main.cpp +++ b/tools/aapt2/Main.cpp @@ -27,7 +27,7 @@ namespace aapt { static const char* sMajorVersion = "2"; // Update minor version whenever a feature or flag is added. -static const char* sMinorVersion = "13"; +static const char* sMinorVersion = "14"; int PrintVersion() { std::cerr << "Android Asset Packaging Tool (aapt) " << sMajorVersion << "." |