| commit | 4b2f37f432121af99502f80a5deef02b99a18a2d | [log] [tgz] |
|---|---|---|
| author | Ta-wei Yen <twyen@google.com> | Thu Apr 27 21:38:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 27 21:38:48 2017 +0000 |
| tree | 3a804f933a5df4c16e3074c7b6bb477e43257f55 | |
| parent | b7bcdda6a321f6ec6a2651cbebd47976a951daf4 [diff] | |
| parent | 107ac2021b055081a9a22a3eef664e53f3597ee8 [diff] |
Merge "Fix NPE in getDisabledCapabilities()" am: e7fa565891 am: b3202f8b67 am: 6afda93ef5 -s ours am: 107ac2021b Change-Id: Ic33f68aafa76e52c584a7068f09278e467c1e4a3