diff options
| author | Serdjuk, Nikolay Y <nikolay.y.serdjuk@intel.com> | 2016-03-31 15:45:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-31 15:45:32 +0000 |
| commit | 1f9252aac3edb3fe97cde2344779446b6eb7da72 (patch) | |
| tree | 655022d8198eec67f98040a925557e32597a6219 /test/MultiDexModifiedSecondary | |
| parent | cc4bf2c6182b4cb208add6eb52015ed5898ba7a1 (diff) | |
| parent | c0b2763154e4219e65bb3f827e783512c962364d (diff) | |
Merge remote-tracking branch \'goog/master\' into nyc-dev
am: c0b2763
* commit 'c0b2763154e4219e65bb3f827e783512c962364d':
Allow x86+arm multilib build.
Change-Id: I535e71691cec5500dd084e49a7ee7e1828fb4c0d
Diffstat (limited to 'test/MultiDexModifiedSecondary')
0 files changed, 0 insertions, 0 deletions