| commit | a0824950cbf4d2fcd3ffb2b0f3a29cf957fcc23d | [log] [tgz] |
|---|---|---|
| author | Stuart Scott <stuartscott@google.com> | Tue Feb 16 22:28:47 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 16 22:28:47 2016 +0000 |
| tree | 93cd6eed739a7fcd9a7e1202dbb0a52efeb6748e | |
| parent | d45b3c6779751087dd30718871fcce1eb1944883 [diff] | |
| parent | c35fa04e69f33372df23031a0bf492d2798be349 [diff] |
Merge "resolve merge conflicts of b9cf2528d9 to marshmallow-cts-dev" into marshmallow-cts-dev am: aaefcf8af5 am: c35fa04e69 * commit 'c35fa04e69f33372df23031a0bf492d2798be349': collect available_processors in device info