| commit | f634af37ca9c27e68e49c75d6f53102f7c4c7919 | [log] [tgz] |
|---|---|---|
| author | Sundeep Ghuman <sghuman@google.com> | Thu May 04 19:37:22 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 04 19:37:22 2017 +0000 |
| tree | 380414ef6588717d902c4e897721eee79b7f0ff6 | |
| parent | 788f2d69f8cce01445d83224cc4e683aaef1d92e [diff] | |
| parent | 451afd6befc808264b7d4a18290b1323d2fc2719 [diff] |
Merge "Merge "Fix an NPE that can result from a race condition." into oc-dev am: d8aa2acea3" into oc-dev-plus-aosp am: 451afd6bef Change-Id: I42917def6e7e89eca3bc93d51f2c8ddf04349e8a