| commit | 6b23d51568a259259989e33e0e26ec0284d47ff7 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Jul 25 07:15:37 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 25 07:15:37 2016 +0000 |
| tree | f53d38779170bc9e73a055442b997e8bf57b757d | |
| parent | 8d37930815b6966087f15836aed2f63b383ab32f [diff] | |
| parent | a12633b03a464e0bf881584266ee6801cd1e6cf2 [diff] |
Merge changes Ib1bff150,I6675bcce into marshmallow-cts-dev am: 5a39ade1a6 am: 1666f4150c am: 09bd15f681 am: 18b6440022 am: 59ebe08bd4 am: a12633b03a Change-Id: Ia0e179f94eb2b79a4b3fbc7585cb227a5ac3c015