diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-02 03:07:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-02 03:08:02 +0000 |
| commit | 36711e0e2cee9181a328718a349454dbd834f4e2 (patch) | |
| tree | e431877ac7ecd981a4f0879cb8f8392ee2d5090d /tools/aapt2/diff/Diff.cpp | |
| parent | ae896d318820ca5c4202c57608d4426fc9f3d798 (diff) | |
| parent | 50d47618300016766852523111bfc7ec991f00ea (diff) | |
Merge changes from topic 'mwd-merge-040115'
* changes:
Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
Merge commit 'd91f193' into merge2
Merge commit '5718646' into merge2
Merge commit '7aa0345' into merge2
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions