diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-01-24 18:48:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-24 18:48:38 +0000 |
| commit | 7b585fd14343b8cf38575ff9b55ec1c9bd8b8012 (patch) | |
| tree | e1cb9c50a6b0815945f89239d82462d1a778b23f /tools/aapt2/diff/Diff.cpp | |
| parent | 246117ab539b37f954e522d65f71967be2d3de62 (diff) | |
| parent | 46eccf5a71b414c593f4db6da0c4f0d3f182c3fe (diff) | |
Merge changes from topic 'am-20fc942671704f459c945a1b626498cb'
* changes:
Merge "Change HFP Client API to support multi device am: c8399321e9" into nyc-mr2-dev-plus-aosp am: 9ac9632ed3
Change HFP Client API to support multi device am: c8399321e9 am: 3978435d5a
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions